X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-annotation-properties-dialog.c;h=9258b466de9684c322a41e1b55657ef324eb8f08;hb=55a4cf536fb74bca091c860f135da85b10cce256;hp=68013f27e21f5858f93f926484fe13d098cfa14c;hpb=bcb6b9fe2668c0ac479d9ed6bffac393943986c4;p=evince.git

diff --git a/shell/ev-annotation-properties-dialog.c b/shell/ev-annotation-properties-dialog.c
index 68013f27..9258b466 100644
--- a/shell/ev-annotation-properties-dialog.c
+++ b/shell/ev-annotation-properties-dialog.c
@@ -100,17 +100,17 @@ ev_annotation_properties_dialog_constructed (GObject *object)
 				  GTK_FILL, GTK_FILL, 0, 0);
 		gtk_widget_show (label);
 
-		dialog->icon = gtk_combo_box_new_text ();
-		gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Note"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Comment"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Key"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Help"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("New Paragraph"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Paragraph"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Insert"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Cross"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Circle"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Unknown"));
+		dialog->icon = gtk_combo_box_text_new ();
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Note"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Comment"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Key"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Help"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("New Paragraph"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Paragraph"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Insert"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Cross"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Circle"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Unknown"));
 		gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->icon), 0);
 		gtk_table_attach (GTK_TABLE (table), dialog->icon,
 				  1, 2, 5, 6,
@@ -139,9 +139,6 @@ ev_annotation_properties_dialog_init (EvAnnotationPropertiesDialog *annot_dialog
 	gtk_window_set_title (GTK_WINDOW (annot_dialog), _("Annotation Properties"));
 	gtk_window_set_destroy_with_parent (GTK_WINDOW (annot_dialog), TRUE);
 	gtk_container_set_border_width (GTK_CONTAINER (annot_dialog), 5);
-#if !GTK_CHECK_VERSION (2, 90, 7)
-	gtk_dialog_set_has_separator (dialog, FALSE);
-#endif
 	gtk_dialog_add_buttons (dialog,
 				GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 				GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
@@ -224,9 +221,9 @@ ev_annotation_properties_dialog_init (EvAnnotationPropertiesDialog *annot_dialog
 			  GTK_FILL, GTK_FILL, 0, 0);
 	gtk_widget_show (label);
 
-	annot_dialog->popup_state = gtk_combo_box_new_text ();
-	gtk_combo_box_append_text (GTK_COMBO_BOX (annot_dialog->popup_state), _("Open"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (annot_dialog->popup_state), _("Close"));
+	annot_dialog->popup_state = gtk_combo_box_text_new ();
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (annot_dialog->popup_state), _("Open"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (annot_dialog->popup_state), _("Close"));
 	gtk_combo_box_set_active (GTK_COMBO_BOX (annot_dialog->popup_state), 1);
 	gtk_table_attach (GTK_TABLE (table), annot_dialog->popup_state,
 			  1, 2, 4, 5,