diff options
author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2011-10-08 22:35:05 +0000 |
---|---|---|
committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2011-10-08 22:35:05 +0000 |
commit | 67c898226cc4c3d40f31da9b21e4f5fa7ac2ea6d (patch) | |
tree | b75c0663582509aa7330dc48c1878eeaa611603f | |
parent | b1813e3ae9ef7ae0ecbeac13b3b033dbad13e9ed (diff) | |
download | pidgin-67c898226cc4c3d40f31da9b21e4f5fa7ac2ea6d.tar.gz |
Remove unnecessary GTK+ version checks now that we depend on 2.10.0.
I thought I did some of this already, though.
-rw-r--r-- | pidgin/gtkconv.c | 17 | ||||
-rw-r--r-- | pidgin/gtkmenutray.h | 4 | ||||
-rw-r--r-- | pidgin/plugins/gestures/gestures.c | 34 |
3 files changed, 1 insertions, 54 deletions
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c index f46441eb63..4e24114905 100644 --- a/pidgin/gtkconv.c +++ b/pidgin/gtkconv.c @@ -1146,9 +1146,6 @@ menu_view_log_cb(GtkAction *action, gpointer data) gdk_window_set_cursor(gtkblist->window->window, cursor); gdk_window_set_cursor(win->window->window, cursor); gdk_cursor_unref(cursor); -#if GTK_CHECK_VERSION(2,4,0) && !GTK_CHECK_VERSION(2,6,0) //FIXME: What? - gdk_display_flush(gdk_drawable_get_display(GDK_DRAWABLE(widget->window))); -#endif name = purple_conversation_get_name(conv); account = purple_conversation_get_account(conv); @@ -3467,7 +3464,6 @@ regenerate_options_items(PidginWindow *win) GtkWidget *menu; PidginConversation *gtkconv; GList *list; -#if GTK_CHECK_VERSION(2,6,0) GtkWidget *more_menu; gtkconv = pidgin_conv_window_get_active_gtkconv(win); @@ -3475,10 +3471,6 @@ regenerate_options_items(PidginWindow *win) "/Conversation/ConversationMenu/MoreMenu"); gtk_widget_show(more_menu); menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(more_menu)); -#else - gtkconv = pidgin_conv_window_get_active_gtkconv(win); - menu = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/More")); -#endif /* Remove the previous entries */ for (list = gtk_container_get_children(GTK_CONTAINER(menu)); list; ) @@ -3534,12 +3526,8 @@ regenerate_plugins_items(PidginWindow *win) action_items = g_list_delete_link(action_items, action_items); } -#if GTK_CHECK_VERSION(2,6,0) item = gtk_ui_manager_get_widget(win->menu.ui, "/Conversation/OptionsMenu"); menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(item)); -#else - menu = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Options")); -#endif list = purple_conversation_get_extended_menu(conv); if (list) { @@ -10130,12 +10118,7 @@ pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv index = gtk_notebook_page_num(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont); -#if GTK_CHECK_VERSION(2,10,0) g_object_ref_sink(G_OBJECT(gtkconv->tab_cont)); -#else - g_object_ref(gtkconv->tab_cont); - gtk_object_sink(GTK_OBJECT(gtkconv->tab_cont)); -#endif gtk_notebook_remove_page(GTK_NOTEBOOK(win->notebook), index); diff --git a/pidgin/gtkmenutray.h b/pidgin/gtkmenutray.h index 07b0ce91cb..158530a7bb 100644 --- a/pidgin/gtkmenutray.h +++ b/pidgin/gtkmenutray.h @@ -40,9 +40,7 @@ typedef struct _PidginMenuTrayClass PidginMenuTrayClass; struct _PidginMenuTray { GtkMenuItem gparent; /**< The parent instance */ GtkWidget *tray; /**< The tray */ -#if GTK_CHECK_VERSION(2,12,0) - gpointer depr1; -#else +#if !GTK_CHECK_VERSION(2,12,0) GtkTooltips *tooltips; /**< Tooltips */ #endif }; diff --git a/pidgin/plugins/gestures/gestures.c b/pidgin/plugins/gestures/gestures.c index 0ef93713f1..51c13f011e 100644 --- a/pidgin/plugins/gestures/gestures.c +++ b/pidgin/plugins/gestures/gestures.c @@ -145,7 +145,6 @@ new_conv_cb(PurpleConversation *conv) } #if 0 -#if GTK_CHECK_VERSION(2,4,0) static void mouse_button_menu_cb(GtkComboBox *opt, gpointer data) { @@ -153,15 +152,6 @@ mouse_button_menu_cb(GtkComboBox *opt, gpointer data) gstroke_set_mouse_button(button + 2); } -#else -static void -mouse_button_menu_cb(GtkMenuItem *item, gpointer data) -{ - int button = (int)data; - - gstroke_set_mouse_button(button + 2); -} -#endif #endif static void @@ -230,9 +220,6 @@ get_config_frame(PurplePlugin *plugin) GtkWidget *toggle; #if 0 GtkWidget *opt; -#if GTK_CHECK_VERSION(2,4,0) - GtkWidget *menu, *item; -#endif #endif /* Outside container */ @@ -243,7 +230,6 @@ get_config_frame(PurplePlugin *plugin) vbox = pidgin_make_frame(ret, _("Mouse Gestures Configuration")); #if 0 -#if GTK_CHECK_VERSION(2,4,0) /* Mouse button drop-down menu */ opt = gtk_combo_box_new_text(); @@ -255,26 +241,6 @@ get_config_frame(PurplePlugin *plugin) gtk_box_pack_start(GTK_BOX(vbox), opt, FALSE, FALSE, 0); gtk_combo_box_set_active(GTK_COMBO_BOX(opt), gstroke_get_mouse_button() - 2); -#else - /* Mouse button drop-down menu */ - menu = gtk_menu_new(); - opt = gtk_option_menu_new(); - - item = gtk_menu_item_new_with_label(_("Middle mouse button")); - g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(mouse_button_menu_cb), opt); - gtk_menu_append(menu, item); - - item = gtk_menu_item_new_with_label(_("Right mouse button")); - g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(mouse_button_menu_cb), opt); - gtk_menu_append(menu, item); - - gtk_box_pack_start(GTK_BOX(vbox), opt, FALSE, FALSE, 0); - gtk_option_menu_set_menu(GTK_OPTION_MENU(opt), menu); - gtk_option_menu_set_history(GTK_OPTION_MENU(opt), - gstroke_get_mouse_button() - 2); -#endif #endif /* "Visual gesture display" checkbox */ |