GNOME.org
 

[gnumeric] Compilation: dead kitten fallout (I think)

commit 05ef022c87a389673804d85655219ea063d423fc
Author: Morten Welinder <terra gnome org>
Date:   Sun Oct 30 16:26:07 2011 -0400

    Compilation: dead kitten fallout (I think)

 src/dialogs/dialog-define-names.c    |    7 +------
 src/dialogs/dialog-function-select.c |    6 +-----
 src/dialogs/dialog-stf-export.c      |    9 ---------
 src/gui-util.c                       |    7 -------
 src/wbc-gtk-actions.c                |    6 ------
 src/widgets/gnumeric-expr-entry.c    |    5 -----
 6 files changed, 2 insertions(+), 38 deletions(-)
---
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index 291beff..b632a4e 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -194,10 +194,8 @@ cb_name_guru_show_all (GtkTreeModel *model, GtkTreePath *path,
 
 static void
 name_guru_erase_search_entry (GtkEntry *entry,
-#ifdef HAVE_GTK_ENTRY_SET_ICON_FROM_STOCK
 			      G_GNUC_UNUSED GtkEntryIconPosition icon_pos,
 			      G_GNUC_UNUSED GdkEvent *event,
-#endif
 			      gpointer data)
 {
 	NameGuruState *state = data;
@@ -255,9 +253,7 @@ name_guru_search (GtkEntry *entry, gpointer data)
 	if (0 == gtk_entry_get_text_length (entry)){
 		name_guru_erase_search_entry
 			(entry,
-#ifdef HAVE_GTK_ENTRY_SET_ICON_FROM_STOCK
 			 GTK_ENTRY_ICON_SECONDARY, NULL,
-#endif
 			 data);
 		return;
 	}
@@ -1214,7 +1210,6 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
 
 	state->search_entry = go_gtk_builder_get_widget (state->gui,
 						    "search_entry");
-#ifdef HAVE_GTK_ENTRY_SET_ICON_FROM_STOCK
 
 	gtk_entry_set_icon_from_stock
 		(GTK_ENTRY (state->search_entry),
@@ -1234,7 +1229,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
 			  "icon-press",
 			  G_CALLBACK (name_guru_erase_search_entry),
 			  state);
-#endif
+
 	g_signal_connect (G_OBJECT (state->search_entry),
 			  "activate",
 			  G_CALLBACK (name_guru_search),
diff --git a/src/dialogs/dialog-function-select.c b/src/dialogs/dialog-function-select.c
index d7fbf7d..7a4b761 100644
--- a/src/dialogs/dialog-function-select.c
+++ b/src/dialogs/dialog-function-select.c
@@ -212,7 +212,6 @@ dialog_function_select_search (GtkEntry *entry, gpointer data)
 				(gpointer) &specs);
 }
 
-#ifdef HAVE_GTK_ENTRY_SET_ICON_FROM_STOCK
 static void
 dialog_function_select_erase_search_entry (GtkEntry *entry,
 			      G_GNUC_UNUSED GtkEntryIconPosition icon_pos,
@@ -222,7 +221,6 @@ dialog_function_select_erase_search_entry (GtkEntry *entry,
 	gtk_entry_set_text (entry, "");
 	dialog_function_select_search (entry, data);
 }
-#endif
 
 static void
 dialog_function_select_cat_changed (G_GNUC_UNUSED GtkComboBox *widget,
@@ -1261,8 +1259,6 @@ dialog_function_select_init (FunctionSelectState *state)
 		gtk_entry_set_text (GTK_ENTRY (state->search_entry),
 				    state->paste.prefix);
 
-#ifdef HAVE_GTK_ENTRY_SET_ICON_FROM_STOCK
-
 	gtk_entry_set_icon_from_stock
 		(GTK_ENTRY (state->search_entry),
 		 GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
@@ -1282,7 +1278,7 @@ dialog_function_select_init (FunctionSelectState *state)
 			  G_CALLBACK
 			  (dialog_function_select_erase_search_entry),
 			  state);
-#endif
+
 	g_signal_connect (G_OBJECT (state->search_entry),
 			  "activate",
 			  G_CALLBACK (dialog_function_select_search),
diff --git a/src/dialogs/dialog-stf-export.c b/src/dialogs/dialog-stf-export.c
index 129b1b2..cc7032c 100644
--- a/src/dialogs/dialog-stf-export.c
+++ b/src/dialogs/dialog-stf-export.c
@@ -151,10 +151,6 @@ stf_export_dialog_format_page_init (TextExportState *state)
 				break;
 		gtk_combo_box_set_active (state->format.separator, ui);
 		if (!format_seps[ui]) {
-#ifdef HAVE_GTK_ENTRY_GET_BUFFER
-			/* We need to work around gtk bug #601922 */
-			gtk_entry_get_buffer (GTK_ENTRY (state->format.custom));
-#endif
 			gtk_editable_insert_text (GTK_EDITABLE (state->format.custom),
 						  s, -1,
 						  &pos);
@@ -184,11 +180,6 @@ stf_export_dialog_format_page_init (TextExportState *state)
 		state->format.quotechar = GTK_COMBO_BOX_TEXT (go_gtk_builder_get_widget (state->gui, "format_quotechar"));
 		g_object_get (sobj, "quote", &s, NULL);
 
-#ifdef HAVE_GTK_ENTRY_GET_BUFFER
-		/* We need to work around gtk bug #601922 */
-		gtk_entry_get_buffer (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (state->format.quotechar))));
-#endif
-
 		gtk_editable_insert_text (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (state->format.quotechar))),
 					  s, -1, &pos);
 		g_free (s);
diff --git a/src/gui-util.c b/src/gui-util.c
index 6f3e04a..491c10b 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -1495,15 +1495,8 @@ void
 gnm_cell_renderer_text_copy_background_to_cairo (GtkCellRendererText *crt,
 						 cairo_t *cr)
 {
-#ifdef HAVE_GDK_CAIRO_SET_SOURCE_RGBA
-	/* Untested code.  */
 	GdkRGBA *c = NULL;
 	g_object_get (crt, "background-rgba", &c, NULL);
 	gdk_cairo_set_source_rgba (cr, c);
 	gdk_rgba_free (c);
-#else
-	GdkColor c;
-	g_object_get (crt, "background-gdk", &c, NULL);
-	gdk_cairo_set_source_color (cr, &c);
-#endif
 }
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 46377d6..fa17a43 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -2047,13 +2047,7 @@ static GtkActionEntry const permanent_actions[] = {
 		NULL, N_("Send the current file via email"),
 		G_CALLBACK (cb_file_sendto) },
 	{ "FilePrintArea",      NULL, N_("Print Area & Breaks")},
-#ifdef HAVE_GTK_ADJUSTMENT_CONFIGURE
-	/* gtk_adjustment_configure implies gtk 2.14 or later */
-	/* that is required for GTK_STOCK_PAGE_SETUP */
 	{ "FilePageSetup", GTK_STOCK_PAGE_SETUP, N_("Page Set_up..."),
-#else
-	{ "FilePageSetup", NULL, N_("Page Set_up..."),
-#endif
 		NULL, N_("Setup the page settings for your current printer"),
 		G_CALLBACK (cb_file_page_setup) },
 	{ "FilePrintPreview", GTK_STOCK_PRINT_PREVIEW, NULL,
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index ad678c6..e6287cd 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -1764,11 +1764,6 @@ gee_rangesel_update_text (GnmExprEntry *gee)
 		/* Set the cursor at the end.  It looks nicer */
 		len = strlen (text);
 
-#ifdef HAVE_GTK_ENTRY_GET_BUFFER
-		/* We need to work around gtk bug #601922 */
-		gtk_entry_get_buffer (GTK_ENTRY (gee->entry));
-#endif
-
 		gtk_editable_insert_text (editable, text, len, &rs->text_end);
 		gtk_editable_set_position (editable, rs->text_end);
 		g_free (text);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]