--- a/pidgin/gtkblist.c Sat Nov 20 09:21:29 2010 +0000
+++ b/pidgin/gtkblist.c Sat Nov 20 22:20:35 2010 +0000
@@ -123,7 +123,8 @@
#define PIDGIN_BUDDY_LIST_GET_PRIVATE(list) \
((PidginBuddyListPrivate *)((list)->priv))
-static GtkWidget *accountmenu = NULL;+static guint accounts_merge_id; +static GtkActionGroup *accounts_action_group = NULL; static guint visibility_manager_count = 0;
static GdkVisibilityState gtk_blist_visibility = GDK_VISIBILITY_UNOBSCURED;
@@ -137,6 +138,9 @@
static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
static void sort_method_status(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
static void sort_method_log_activity(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
+static guint sort_merge_id; +static GtkActionGroup *sort_action_group = NULL; static PidginBuddyList *gtkblist = NULL;
static GList *groups_tree(void);
@@ -147,7 +151,6 @@
static void pidgin_blist_update_group(PurpleBuddyList *list, PurpleBlistNode *node);
static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBlistNode *node);
static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full);
-static const char *item_factory_translate_func (const char *path, gpointer func_data); static gboolean get_iter_from_node(PurpleBlistNode *node, GtkTreeIter *iter);
static gboolean buddy_is_displayable(PurpleBuddy *buddy);
static void redo_buddy_list(PurpleBuddyList *list, gboolean remove, gboolean rerender);
@@ -2041,64 +2044,70 @@
-static void pidgin_blist_buddy_details_cb(gpointer data, guint action, GtkWidget *item)+static void gtk_blist_show_xfer_dialog_cb(GtkAction *item, gpointer data) + pidgin_xfer_dialog_show(NULL); +static void pidgin_blist_buddy_details_cb(GtkToggleAction *item, gpointer data) pidgin_set_cursor(gtkblist->window, GDK_WATCH);
purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons",
- gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)));+ gtk_toggle_action_get_active(item)); pidgin_clear_cursor(gtkblist->window);
-static void pidgin_blist_show_idle_time_cb(gpointer data, guint action, GtkWidget *item)+static void pidgin_blist_show_idle_time_cb(GtkToggleAction *item, gpointer data) pidgin_set_cursor(gtkblist->window, GDK_WATCH);
purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time",
- gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)));+ gtk_toggle_action_get_active(item)); pidgin_clear_cursor(gtkblist->window);
-static void pidgin_blist_show_protocol_icons_cb(gpointer data, guint action, GtkWidget *item)+static void pidgin_blist_show_protocol_icons_cb(GtkToggleAction *item, gpointer data) purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons",
- gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)));-static void pidgin_blist_show_empty_groups_cb(gpointer data, guint action, GtkWidget *item)+ gtk_toggle_action_get_active(item)); +static void pidgin_blist_show_empty_groups_cb(GtkToggleAction *item, gpointer data) pidgin_set_cursor(gtkblist->window, GDK_WATCH);
purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/show_empty_groups",
- gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)));+ gtk_toggle_action_get_active(item)); pidgin_clear_cursor(gtkblist->window);
-static void pidgin_blist_edit_mode_cb(gpointer callback_data, guint callback_action,+static void pidgin_blist_edit_mode_cb(GtkToggleAction *checkitem, gpointer data) pidgin_set_cursor(gtkblist->window, GDK_WATCH);
purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies",
- gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(checkitem)));+ gtk_toggle_action_get_active(checkitem)); pidgin_clear_cursor(gtkblist->window);
-static void pidgin_blist_mute_sounds_cb(gpointer data, guint action, GtkWidget *item)- purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/sound/mute", GTK_CHECK_MENU_ITEM(item)->active);+static void pidgin_blist_mute_sounds_cb(GtkToggleAction *item, gpointer data) + purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/sound/mute", + gtk_toggle_action_get_active(item)); pidgin_blist_mute_pref_cb(const char *name, PurplePrefType type,
gconstpointer value, gpointer data)
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item(gtkblist->ift,- N_("/Tools/Mute Sounds"))), (gboolean)GPOINTER_TO_INT(value));+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(gtkblist->ui, + "/BList/ToolsMenu/MuteSounds")), (gboolean)GPOINTER_TO_INT(value)); @@ -2110,7 +2119,7 @@
if(!strcmp(value, "none"))
- gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), sensitive);+ gtk_action_set_sensitive(gtk_ui_manager_get_action(gtkblist->ui, "/BList/ToolsMenu/MuteSounds"), sensitive); @@ -3651,6 +3660,123 @@
/***************************************************
***************************************************/
+/* TODO: fill out tooltips... */ +static const GtkActionEntry blist_menu_entries[] = { + { "BuddiesMenu", NULL, N_("_Buddies"), NULL, NULL, NULL }, + { "NewInstantMessage", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, N_("New Instant _Message..."), "<control>M", NULL, pidgin_dialogs_im }, + { "JoinAChat", PIDGIN_STOCK_CHAT, N_("Join a _Chat..."), "<control>C", NULL, pidgin_blist_joinchat_show }, + { "GetUserInfo", PIDGIN_STOCK_TOOLBAR_USER_INFO, N_("Get User _Info..."), "<control>I", NULL, pidgin_dialogs_info }, + { "ViewUserLog", NULL, N_("View User _Log..."), "<control>L", NULL, pidgin_dialogs_log }, + { "ShowMenu", NULL, N_("Sh_ow"), NULL, NULL, NULL }, + { "SortMenu", NULL, N_("_Sort Buddies"), NULL, NULL, NULL }, + { "AddBuddy", GTK_STOCK_ADD, N_("_Add Buddy..."), "<control>B", NULL, pidgin_blist_add_buddy_cb }, + { "AddChat", GTK_STOCK_ADD, N_("Add C_hat..."), NULL, NULL, pidgin_blist_add_chat_cb }, + { "AddGroup", GTK_STOCK_ADD, N_("Add _Group..."), NULL, NULL, purple_blist_request_add_group }, + { "Quit", GTK_STOCK_QUIT, N_("_Quit"), "<control>Q", NULL, purple_core_quit }, + { "AccountsMenu", NULL, N_("_Accounts"), NULL, NULL, NULL }, + { "ManageAccounts", NULL, N_("Manage Accounts"), "<control>A", NULL, pidgin_accounts_window_show }, + { "EnableAccountMenu", NULL, N_("Enable Account"), NULL, NULL, NULL }, + { "ToolsMenu", NULL, N_("_Tools"), NULL, NULL, NULL }, + { "BuddyPounces", NULL, N_("Buddy _Pounces"), NULL, NULL, pidgin_pounces_manager_show }, + { "Certificates", NULL, N_("_Certificates"), NULL, NULL, pidgin_certmgr_show }, + { "CustomSmileys", PIDGIN_STOCK_TOOLBAR_SMILEY, N_("Custom Smile_ys"), "<control>Y", NULL, pidgin_smiley_manager_show }, + { "Plugins", PIDGIN_STOCK_TOOLBAR_PLUGINS, N_("Plu_gins"), "<control>U", NULL, pidgin_plugin_dialog_show }, + { "Preferences", GTK_STOCK_PREFERENCES, N_("Pr_eferences"), "<control>P", NULL, pidgin_prefs_show }, + { "Privacy", NULL, N_("Pr_ivacy"), NULL, NULL, pidgin_privacy_dialog_show }, + { "SetMood", NULL, N_("Set _Mood"), "<control>O", NULL, set_mood_show }, + { "FileTransfers", PIDGIN_STOCK_TOOLBAR_TRANSFER, N_("_File Transfers"), "<control>T", NULL, G_CALLBACK(gtk_blist_show_xfer_dialog_cb) }, + { "RoomList", NULL, N_("R_oom List"), NULL, NULL, pidgin_roomlist_dialog_show }, + { "SystemLog", NULL, N_("System _Log"), NULL, NULL, gtk_blist_show_systemlog_cb }, + { "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL }, + { "OnlineHelp", GTK_STOCK_HELP, N_("Online _Help"), "F1", NULL, gtk_blist_show_onlinehelp_cb }, + { "BuildInformation", NULL, N_("_Build Information"), NULL, NULL, pidgin_dialogs_buildinfo }, + { "DebugWindow", NULL, N_("_Debug Window"), NULL, NULL, toggle_debug }, + { "DeveloperInformation", NULL, N_("De_veloper Information"), NULL, NULL, pidgin_dialogs_developers }, + { "TranslatorInformation", NULL, N_("_Translator Information"), NULL, NULL, pidgin_dialogs_translators }, + { "About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, pidgin_dialogs_about }, +static const GtkToggleActionEntry blist_menu_toggle_entries[] = { + /* Buddies->Show menu */ + { "ShowOffline", NULL, N_("_Offline Buddies"), NULL, NULL, G_CALLBACK(pidgin_blist_edit_mode_cb), FALSE }, + { "ShowEmptyGroups", NULL, N_("_Empty Groups"), NULL, NULL, G_CALLBACK(pidgin_blist_show_empty_groups_cb), FALSE }, + { "ShowBuddyDetails", NULL, N_("Buddy _Details"), NULL, NULL, G_CALLBACK(pidgin_blist_buddy_details_cb), FALSE }, + { "ShowIdleTimes", NULL, N_("Idle _Times"), NULL, NULL, G_CALLBACK(pidgin_blist_show_idle_time_cb), FALSE }, + { "ShowProtocolIcons", NULL, N_("_Protocol Icons"), NULL, NULL, G_CALLBACK(pidgin_blist_show_protocol_icons_cb), FALSE }, + { "MuteSounds", NULL, N_("Mute _Sounds"), NULL, NULL, G_CALLBACK(pidgin_blist_mute_sounds_cb), FALSE }, +static const char *blist_menu = + "<menubar name='BList'>" + "<menu action='BuddiesMenu'>" + "<menuitem action='NewInstantMessage'/>" + "<menuitem action='JoinAChat'/>" + "<menuitem action='GetUserInfo'/>" + "<menuitem action='ViewUserLog'/>" + "<menu action='ShowMenu'>" + "<menuitem action='ShowOffline'/>" + "<menuitem action='ShowEmptyGroups'/>" + "<menuitem action='ShowBuddyDetails'/>" + "<menuitem action='ShowIdleTimes'/>" + "<menuitem action='ShowProtocolIcons'/>" + "<menu action='SortMenu'/>" + "<menuitem action='AddBuddy'/>" + "<menuitem action='AddChat'/>" + "<menuitem action='AddGroup'/>" + "<menuitem action='Quit'/>" + "<menu action='AccountsMenu'>" + "<menuitem action='ManageAccounts'/>" + "<menu action='EnableAccountMenu'/>" + "<placeholder name='Accounts'/>" + "<menu action='ToolsMenu'>" + "<menuitem action='BuddyPounces'/>" + "<menuitem action='Certificates'/>" + "<menuitem action='CustomSmileys'/>" + "<menuitem action='Plugins'/>" + "<menuitem action='Preferences'/>" + "<menuitem action='Privacy'/>" + "<menuitem action='SetMood'/>" + "<menuitem action='FileTransfers'/>" + "<menuitem action='RoomList'/>" + "<menuitem action='SystemLog'/>" + "<menuitem action='MuteSounds'/>" + "<placeholder name='PluginActions'/>" + "<menu action='HelpMenu'>" + "<menuitem action='OnlineHelp'/>" + "<menuitem action='BuildInformation'/>" + "<menuitem action='DebugWindow'/>" + "<menuitem action='DeveloperInformation'/>" + "<menuitem action='TranslatorInformation'/>" + "<menuitem action='About'/>" static GtkItemFactoryEntry blist_menu[] =
/* NOTE: Do not set any accelerator to Control+O. It is mapped by
@@ -3707,6 +3833,7 @@
{ "/Help/sep2", NULL, NULL, 0, "<Separator>", NULL },
{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 4, "<StockItem>", GTK_STOCK_ABOUT },
/*********************************************************
* Private Utility functions *
@@ -4524,12 +4651,21 @@
static const char *require_connection[] =
+ "/BList/BuddiesMenu/NewInstantMessage", + "/BList/BuddiesMenu/JoinAChat", + "/BList/BuddiesMenu/GetUserInfo", + "/BList/BuddiesMenu/AddBuddy", + "/BList/BuddiesMenu/AddChat", + "/BList/BuddiesMenu/AddGroup", N_("/Buddies/New Instant Message..."),
N_("/Buddies/Join a Chat..."),
N_("/Buddies/Get User Info..."),
N_("/Buddies/Add Buddy..."),
N_("/Buddies/Add Chat..."),
N_("/Buddies/Add Group..."),
static const int require_connection_size = sizeof(require_connection)
@@ -4542,7 +4678,7 @@
update_menu_bar(PidginBuddyList *gtkblist)
@@ -4554,21 +4690,21 @@
for (i = 0; i < require_connection_size; i++)
- widget = gtk_item_factory_get_widget(gtkblist->ift, require_connection[i]);- gtk_widget_set_sensitive(widget, sensitive);- widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Buddies/Join a Chat..."));- gtk_widget_set_sensitive(widget, pidgin_blist_joinchat_is_showable());- widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Buddies/Add Chat..."));- gtk_widget_set_sensitive(widget, pidgin_blist_joinchat_is_showable());- widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Privacy"));- gtk_widget_set_sensitive(widget, sensitive);- widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Room List"));- gtk_widget_set_sensitive(widget, pidgin_roomlist_is_showable());+ action = gtk_ui_manager_get_action(gtkblist->ui, require_connection[i]); + gtk_action_set_sensitive(action, sensitive); + action = gtk_ui_manager_get_action(gtkblist->ui, "/BList/BuddiesMenu/JoinAChat"); + gtk_action_set_sensitive(action, pidgin_blist_joinchat_is_showable()); + action = gtk_ui_manager_get_action(gtkblist->ui, "/BList/BuddiesMenu/AddChat"); + gtk_action_set_sensitive(action, pidgin_blist_joinchat_is_showable()); + action = gtk_ui_manager_get_action(gtkblist->ui, "/BList/ToolsMenu/Privacy"); + gtk_action_set_sensitive(action, sensitive); + action = gtk_ui_manager_get_action(gtkblist->ui, "/BList/ToolsMenu/RoomList"); + gtk_action_set_sensitive(action, pidgin_roomlist_is_showable()); @@ -4859,12 +4995,6 @@
-item_factory_translate_func (const char *path, gpointer func_data)- return _((char *)path); void pidgin_blist_setup_sort_methods()
@@ -5533,8 +5663,28 @@
headline_style_set (GtkWidget *widget,
+#if GTK_CHECK_VERSION(2,12,0) + if (gtkblist->changing_style) + /* This is a hack needed to use the tooltip background colour */ + window = gtk_window_new(GTK_WINDOW_POPUP); + gtk_widget_set_name(window, "gtk-tooltip"); + gtk_widget_ensure_style(window); + style = gtk_widget_get_style(window); + gtkblist->changing_style = TRUE; + gtk_widget_set_style(gtkblist->headline_hbox, style); + gtkblist->changing_style = FALSE; + gtk_widget_destroy(window); + gtk_widget_queue_draw(gtkblist->headline_hbox);
if (gtkblist->changing_style)
@@ -5554,6 +5704,7 @@
gtkblist->changing_style = FALSE;
g_object_unref (tooltips);
/******************************************/
@@ -5791,6 +5942,8 @@
+ GtkActionGroup *action_group; GtkAccelGroup *accel_group;
GtkTreeSelection *selection;
GtkTargetEntry dte[] = {{"PURPLE_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
@@ -5840,28 +5993,41 @@
gtk_widget_add_events(gtkblist->window, GDK_VISIBILITY_NOTIFY_MASK);
/******************************* Menu bar *************************************/
- accel_group = gtk_accel_group_new();- gtk_window_add_accel_group(GTK_WINDOW (gtkblist->window), accel_group);- g_object_unref(accel_group);- gtkblist->ift = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<PurpleMain>", accel_group);- gtk_item_factory_set_translate_func(gtkblist->ift,- (GtkTranslateFunc)item_factory_translate_func,- gtk_item_factory_create_items(gtkblist->ift, sizeof(blist_menu) / sizeof(*blist_menu),- g_signal_connect(G_OBJECT(accel_group), "accel-changed", G_CALLBACK(pidgin_save_accels_cb), NULL);- menu = gtk_item_factory_get_widget(gtkblist->ift, "<PurpleMain>");+ action_group = gtk_action_group_new("BListActions"); + gtk_action_group_add_actions(action_group, + G_N_ELEMENTS(blist_menu_entries), + GTK_WINDOW(gtkblist->window)); + gtk_action_group_add_toggle_actions(action_group, + blist_menu_toggle_entries, + G_N_ELEMENTS(blist_menu_toggle_entries), + GTK_WINDOW(gtkblist->window)); + gtk_action_group_set_translation_domain(action_group, + gtkblist->ui = gtk_ui_manager_new(); + gtk_ui_manager_insert_action_group(gtkblist->ui, action_group, 0); + accel_group = gtk_ui_manager_get_accel_group(gtkblist->ui); + gtk_window_add_accel_group(GTK_WINDOW(gtkblist->window), accel_group); + if (!gtk_ui_manager_add_ui_from_string(gtkblist->ui, blist_menu, -1, &error)) + g_message("building menus failed: %s", error->message); + menu = gtk_ui_manager_get_widget(gtkblist->ui, "/BList"); gtkblist->menutray = pidgin_menu_tray_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtkblist->menutray);
gtk_widget_show(gtkblist->menutray);
gtk_box_pack_start(GTK_BOX(gtkblist->main_vbox), menu, FALSE, FALSE, 0);
- accountmenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts")); /****************************** Notebook *************************************/
gtkblist->notebook = gtk_notebook_new();
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gtkblist->notebook), FALSE);
@@ -6052,26 +6218,26 @@
/* set the Show Offline Buddies option. must be done
* after the treeview or faceprint gets mad. -Robot101
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Offline Buddies"))),+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(gtkblist->ui, "/BList/BuddiesMenu/ShowMenu/ShowOffline")), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies"));
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Empty Groups"))),+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(gtkblist->ui, "/BList/BuddiesMenu/ShowMenu/ShowEmptyGroups")), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_empty_groups"));
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Tools/Mute Sounds"))),+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(gtkblist->ui, "/BList/ToolsMenu/MuteSounds")), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/mute"));
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Buddy Details"))),+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(gtkblist->ui, "/BList/BuddiesMenu/ShowMenu/ShowBuddyDetails")), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"));
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Idle Times"))),+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(gtkblist->ui, "/BList/BuddiesMenu/ShowMenu/ShowIdleTimes")), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time"));
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Protocol Icons"))),+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(gtkblist->ui, "/BList/BuddiesMenu/ShowMenu/ShowProtocolIcons")), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"));
if(!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none"))
- gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), FALSE);+ gtk_action_set_sensitive(gtk_ui_manager_get_action(gtkblist->ui, "/BList/ToolsMenu/MuteSounds"), FALSE); /* Update some dynamic things */
update_menu_bar(gtkblist);
@@ -6928,7 +7094,7 @@
purple_signals_disconnect_by_handle(gtkblist);
if (gtkblist->headline_close)
- gdk_pixbuf_unref(gtkblist->headline_close);+ g_object_unref(G_OBJECT(gtkblist->headline_close)); gtk_widget_destroy(gtkblist->window);
@@ -6948,7 +7114,7 @@
gtkblist->window = gtkblist->vbox = gtkblist->treeview = NULL;
g_object_unref(G_OBJECT(gtkblist->treemodel));
gtkblist->treemodel = NULL;
- g_object_unref(G_OBJECT(gtkblist->ift));+ g_object_unref(G_OBJECT(gtkblist->ui)); g_object_unref(G_OBJECT(gtkblist->empty_avatar));
gdk_cursor_unref(gtkblist->hand_cursor);
@@ -6962,7 +7128,6 @@
purple_prefs_disconnect_by_handle(pidgin_blist_get_handle());
@@ -7973,40 +8138,43 @@
-build_plugin_actions(GtkWidget *menu, PurplePlugin *plugin,+build_plugin_actions(GtkActionGroup *action_group, GString *ui, char *parent, + PurplePlugin *plugin, gpointer context) PurplePluginAction *action = NULL;
actions = PURPLE_PLUGIN_ACTIONS(plugin, context);
- for (l = actions; l != NULL; l = l->next)- action = (PurplePluginAction *) l->data;+ for (l = actions; l != NULL; l = l->next) { + action = (PurplePluginAction *)l->data; action->context = context;
- menuitem = gtk_menu_item_new_with_label(action->label);- gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);- g_signal_connect(G_OBJECT(menuitem), "activate",+ name = g_strdup_printf("%s-action-%d", parent, count++); + menuaction = gtk_action_new(name, action->label, NULL, NULL); + gtk_action_group_add_action(action_group, menuaction); + g_string_append_printf(ui, "<menuitem action='%s'/>", name); + g_signal_connect(G_OBJECT(menuaction), "activate", G_CALLBACK(plugin_act), action);
- g_object_set_data_full(G_OBJECT(menuitem), "plugin_action",+ g_object_set_data_full(G_OBJECT(menuaction), "plugin_action", (GDestroyNotify)purple_plugin_action_free);
- gtk_widget_show(menuitem);- pidgin_separator(menu);+ g_string_append(ui, "<separator/>"); modify_account_cb(GtkWidget *widget, gpointer data)
@@ -8038,183 +8206,146 @@
pidgin_blist_update_accounts_menu(void)
- GtkWidget *menuitem = NULL, *submenu = NULL;- GtkAccelGroup *accel_group = NULL;- GList *l = NULL, *accounts = NULL;- gboolean disabled_accounts = FALSE;- gboolean enabled_accounts = FALSE;- if (accountmenu == NULL)+ GList *accounts = NULL; + if ((gtkblist == NULL) || (gtkblist->ui == NULL)) - /* Clear the old Accounts menu */- for (l = gtk_container_get_children(GTK_CONTAINER(accountmenu)); l; l = g_list_delete_link(l, l)) {- if (menuitem != gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts/Manage Accounts")))- gtk_widget_destroy(menuitem);- for (accounts = purple_accounts_get_all(); accounts; accounts = accounts->next) {- GtkWidget *image = NULL;- PurpleAccount *account = NULL;- GdkPixbuf *pixbuf = NULL;- account = accounts->data;- if(!purple_account_get_enabled(account, PIDGIN_UI)) {- if (!disabled_accounts) {- menuitem = gtk_menu_item_new_with_label(_("Enable Account"));- gtk_menu_shell_append(GTK_MENU_SHELL(accountmenu), menuitem);- submenu = gtk_menu_new();- gtk_menu_set_accel_group(GTK_MENU(submenu), accel_group);- gtk_menu_set_accel_path(GTK_MENU(submenu), N_("<PurpleMain>/Accounts/Enable Account"));- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);- disabled_accounts = TRUE;- buf = g_strconcat(purple_account_get_username(account), " (",- purple_account_get_protocol_name(account), ")", NULL);- menuitem = gtk_image_menu_item_new_with_label(buf);- pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);- if (!purple_account_is_connected(account))- gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE);- image = gtk_image_new_from_pixbuf(pixbuf);- g_object_unref(G_OBJECT(pixbuf));- gtk_widget_show(image);- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);- g_signal_connect(G_OBJECT(menuitem), "activate",- G_CALLBACK(enable_account_cb), account);- gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);- enabled_accounts = TRUE;- if (!enabled_accounts) {- gtk_widget_show_all(accountmenu);- pidgin_separator(accountmenu);- accel_group = gtk_menu_get_accel_group(GTK_MENU(accountmenu));+ /* Clear the old menu */ + if (accounts_action_group) { + gtk_ui_manager_remove_ui(gtkblist->ui, accounts_merge_id); + gtk_ui_manager_remove_action_group(gtkblist->ui, accounts_action_group); + g_object_unref(G_OBJECT(accounts_action_group)); + accounts_action_group = gtk_action_group_new("Accounts"); + gtk_action_group_set_translation_domain(accounts_action_group, PACKAGE); + accounts_ui = g_string_new(NULL); + enable_ui = g_string_new(NULL); + action = gtk_action_new("none-available", N_("No actions available"), NULL, NULL); + gtk_action_group_add_action(accounts_action_group, action); + gtk_action_set_sensitive(action, FALSE); for (accounts = purple_accounts_get_all(); accounts; accounts = accounts->next) {
- char *accel_path_buf = NULL;- GtkWidget *image = NULL;- PurpleConnection *gc = NULL; PurpleAccount *account = NULL;
- GdkPixbuf *pixbuf = NULL;- PurplePlugin *plugin = NULL;- PurplePluginProtocolInfo *prpl_info; account = accounts->data;
- if (!purple_account_get_enabled(account, PIDGIN_UI))- buf = g_strconcat(purple_account_get_username(account), " (",+ base = name = g_strdup_printf("account%d", count); + label = g_strconcat(purple_account_get_username(account), " (", purple_account_get_protocol_name(account), ")", NULL);
- menuitem = gtk_image_menu_item_new_with_label(buf);- accel_path_buf = g_strconcat(N_("<PurpleMain>/Accounts/"), buf, NULL);- pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);- if (!purple_account_is_connected(account))- gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf,- image = gtk_image_new_from_pixbuf(pixbuf);- g_object_unref(G_OBJECT(pixbuf));- gtk_widget_show(image);- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);- gtk_menu_shell_append(GTK_MENU_SHELL(accountmenu), menuitem);- submenu = gtk_menu_new();- gtk_menu_set_accel_group(GTK_MENU(submenu), accel_group);- gtk_menu_set_accel_path(GTK_MENU(submenu), accel_path_buf);- g_free(accel_path_buf);- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);- menuitem = gtk_menu_item_new_with_mnemonic(_("_Edit Account"));- g_signal_connect(G_OBJECT(menuitem), "activate",- G_CALLBACK(modify_account_cb), account);- gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);- pidgin_separator(submenu);- gc = purple_account_get_connection(account);- plugin = gc && PURPLE_CONNECTION_IS_CONNECTED(gc) ? gc->prpl : NULL;- prpl_info = plugin ? PURPLE_PLUGIN_PROTOCOL_INFO(plugin) : NULL;- (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_moods) ||- PURPLE_PLUGIN_HAS_ACTIONS(plugin))) {- if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_moods) &&- gc->flags & PURPLE_CONNECTION_SUPPORT_MOODS) {- if (purple_account_get_status(account, "mood")) {- menuitem = gtk_menu_item_new_with_mnemonic(_("Set _Mood..."));- g_signal_connect(G_OBJECT(menuitem), "activate",- G_CALLBACK(set_mood_cb), account);- gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);+ action = gtk_action_new(name, label, NULL, NULL); + gtk_action_group_add_action(accounts_action_group, action); + if (!purple_account_get_enabled(account, PIDGIN_UI)) { + g_string_append_printf(enable_ui, "<menuitem action='%s'/>", name); + g_signal_connect(G_OBJECT(action), "activate", + G_CALLBACK(enable_account_cb), account); + PurpleConnection *gc = NULL; + PurplePlugin *plugin = NULL; + g_string_append_printf(accounts_ui, "<menu action='%s'>", name); + name = g_strconcat(base, "-edit", NULL); + action = gtk_action_new(name, N_("_Edit Account"), NULL, NULL); + gtk_action_group_add_action(accounts_action_group, action); + g_signal_connect(G_OBJECT(action), "activate", + G_CALLBACK(modify_account_cb), account); + g_string_append_printf(accounts_ui, "<menuitem action='%s'/>", name); + g_string_append(accounts_ui, "<separator/>"); + gc = purple_account_get_connection(account); + plugin = gc && PURPLE_CONNECTION_IS_CONNECTED(gc) ? gc->prpl : NULL; + if (plugin && PURPLE_PLUGIN_HAS_ACTIONS(plugin)) { + build_plugin_actions(accounts_action_group, accounts_ui, base, plugin, gc); + g_string_append(accounts_ui, "<menuitem action='none-available'/>"); - if (PURPLE_PLUGIN_HAS_ACTIONS(plugin)) {- build_plugin_actions(submenu, plugin, gc);- menuitem = gtk_menu_item_new_with_label(_("No actions available"));- gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);- gtk_widget_set_sensitive(menuitem, FALSE);- pidgin_separator(submenu);- menuitem = gtk_menu_item_new_with_mnemonic(_("_Disable"));- g_signal_connect(G_OBJECT(menuitem), "activate",- G_CALLBACK(disable_account_cb), account);- gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);- gtk_widget_show_all(accountmenu);-static GList *plugin_submenus = NULL;+ g_string_append(accounts_ui, "<separator/>"); + name = g_strconcat(base, "-disable", NULL); + action = gtk_action_new(name, N_("_Disable"), NULL, NULL); + gtk_action_group_add_action(accounts_action_group, action); + g_signal_connect(G_OBJECT(action), "activate", + G_CALLBACK(disable_account_cb), account); + g_string_append_printf(accounts_ui, "<menuitem action='%s'/>", name); + g_string_append(accounts_ui, "</menu>"); + ui_string = g_strconcat("<ui><menubar action='BList'><menu action='AccountsMenu'><menu action='EnableAccountMenu'>", + "</menu><placeholder name='Accounts'>", + "</placeholder></menu></menubar></ui>", + gtk_ui_manager_insert_action_group(gtkblist->ui, accounts_action_group, 1); + accounts_merge_id = gtk_ui_manager_add_ui_from_string(gtkblist->ui, ui_string, -1, NULL); +purple_debug_info("blist", "The account menu is {%s}\n", ui_string); + g_string_free(enable_ui, TRUE); + g_string_free(accounts_ui, TRUE); +static guint plugins_merge_id; +static GtkActionGroup *plugins_action_group = NULL; pidgin_blist_update_plugin_actions(void)
- GtkWidget *menuitem, *submenu; PurplePlugin *plugin = NULL;
- GtkAccelGroup *accel_group;- GtkWidget *pluginmenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools"));- g_return_if_fail(pluginmenu != NULL);- /* Remove old plugin action submenus from the Tools menu */- for (l = plugin_submenus; l; l = l->next)- gtk_widget_destroy(GTK_WIDGET(l->data));- g_list_free(plugin_submenus);- plugin_submenus = NULL;- accel_group = gtk_menu_get_accel_group(GTK_MENU(pluginmenu));+ if ((gtkblist == NULL) || (gtkblist->ui == NULL)) + /* Clear the old menu */ + if (plugins_action_group) { + gtk_ui_manager_remove_ui(gtkblist->ui, plugins_merge_id); + gtk_ui_manager_remove_action_group(gtkblist->ui, plugins_action_group); + g_object_unref(G_OBJECT(plugins_action_group)); + plugins_action_group = gtk_action_group_new("PluginActions"); + gtk_action_group_set_translation_domain(plugins_action_group, PACKAGE); + plugins_ui = g_string_new(NULL); /* Add a submenu for each plugin with custom actions */
for (l = purple_plugins_get_loaded(); l; l = l->next) {
- plugin = (PurplePlugin *) l->data;+ plugin = (PurplePlugin *)l->data; if (PURPLE_IS_PROTOCOL_PLUGIN(plugin))
@@ -8222,28 +8353,35 @@
if (!PURPLE_PLUGIN_HAS_ACTIONS(plugin))
- menuitem = gtk_image_menu_item_new_with_label(_(plugin->info->name));- gtk_menu_shell_append(GTK_MENU_SHELL(pluginmenu), menuitem);- plugin_submenus = g_list_append(plugin_submenus, menuitem);- submenu = gtk_menu_new();- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);- gtk_menu_set_accel_group(GTK_MENU(submenu), accel_group);- path = g_strdup_printf("%s/Tools/%s", gtkblist->ift->path, plugin->info->name);- gtk_menu_set_accel_path(GTK_MENU(submenu), path);- build_plugin_actions(submenu, plugin, NULL);- gtk_widget_show_all(pluginmenu);+ name = g_strdup_printf("plugin%d", count); + action = gtk_action_new(name, plugin->info->name, NULL, NULL); + gtk_action_group_add_action(plugins_action_group, action); + g_string_append_printf(plugins_ui, "<menu action='%s'>", name); + build_plugin_actions(plugins_action_group, plugins_ui, name, plugin, NULL); + g_string_append(plugins_ui, "</menu>"); + ui_string = g_strconcat("<ui><menubar action='BList'><menu action='ToolsMenu'><placeholder name='PluginActions'>", + "</placeholder></menu></menubar></ui>", + gtk_ui_manager_insert_action_group(gtkblist->ui, plugins_action_group, 1); + plugins_merge_id = gtk_ui_manager_add_ui_from_string(gtkblist->ui, ui_string, -1, NULL); +purple_debug_info("blist", "The plugins menu is {%s}\n", ui_string); + g_string_free(plugins_ui, TRUE); -sortmethod_act(GtkCheckMenuItem *checkmenuitem, char *id)- if (gtk_check_menu_item_get_active(checkmenuitem))+sortmethod_act(GtkRadioAction *action, GtkRadioAction *current, char *id) pidgin_set_cursor(gtkblist->window, GDK_WATCH);
/* This is redundant. I think. */
@@ -8257,40 +8395,57 @@
pidgin_blist_update_sort_methods(void)
- GtkWidget *menuitem = NULL, *activeitem = NULL; PidginBlistSortMethod *method = NULL;
const char *m = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/sort_type");
- if ((gtkblist == NULL) || (gtkblist->ift == NULL))- g_return_if_fail(m != NULL);- sortmenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Buddies/Sort Buddies"));+ GtkRadioAction *action; + if ((gtkblist == NULL) || (gtkblist->ui == NULL)) - for (l = gtk_container_get_children(GTK_CONTAINER(sortmenu)); l; l = g_list_delete_link(l, l)) {- gtk_widget_destroy(GTK_WIDGET(menuitem));+ if (sort_action_group) { + gtk_ui_manager_remove_ui(gtkblist->ui, sort_merge_id); + gtk_ui_manager_remove_action_group(gtkblist->ui, sort_action_group); + g_object_unref(G_OBJECT(sort_action_group)); + sort_action_group = gtk_action_group_new("SortMethods"); + gtk_action_group_set_translation_domain(sort_action_group, PACKAGE); + ui_string = g_string_new("<ui><menubar name='BList'>" + "<menu action='BuddiesMenu'><menu action='SortMenu'>"); for (l = pidgin_blist_sort_methods; l; l = l->next) {
- method = (PidginBlistSortMethod *) l->data;- menuitem = gtk_radio_menu_item_new_with_label(sl, _(method->name));- if (g_str_equal(m, method->id))- sl = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));- gtk_menu_shell_append(GTK_MENU_SHELL(sortmenu), menuitem);- g_signal_connect(G_OBJECT(menuitem), "toggled",- G_CALLBACK(sortmethod_act), method->id);- gtk_widget_show(menuitem);- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(activeitem), TRUE);+ method = (PidginBlistSortMethod *)l->data; + g_string_append_printf(ui_string, "<menuitem action='%s'/>", method->id); + action = gtk_radio_action_new(method->id, + gtk_action_group_add_action_with_accel(sort_action_group, GTK_ACTION(action), NULL); + gtk_radio_action_set_group(action, sl); + sl = gtk_radio_action_get_group(action); + if (!strcmp(m, method->id)) + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), FALSE); + g_signal_connect(G_OBJECT(action), "changed", + G_CALLBACK(sortmethod_act), method->id); + g_string_append(ui_string, "</menu></menu></menubar></ui>"); + gtk_ui_manager_insert_action_group(gtkblist->ui, sort_action_group, 1); + sort_merge_id = gtk_ui_manager_add_ui_from_string(gtkblist->ui, ui_string->str, -1, NULL); + g_string_free(ui_string, TRUE); --- a/pidgin/gtkconv.c Sat Nov 20 09:21:29 2010 +0000
+++ b/pidgin/gtkconv.c Sat Nov 20 22:20:35 2010 +0000
@@ -160,7 +160,6 @@
static void gtkconv_set_unseen(PidginConversation *gtkconv, PidginUnseenState state);
static void update_typing_icon(PidginConversation *gtkconv);
static void update_typing_message(PidginConversation *gtkconv, const char *message);
-static const char *item_factory_translate_func (const char *path, gpointer func_data); gboolean pidgin_conv_has_focus(PurpleConversation *conv);
static GdkColor* generate_nick_colors(guint *numcolors, GdkColor background);
static gboolean color_is_visible(GdkColor foreground, GdkColor background, int color_contrast, int brightness_contrast);
@@ -978,7 +977,7 @@
-menu_new_conv_cb(gpointer data, guint action, GtkWidget *widget)+menu_new_conv_cb(GtkAction *action, gpointer data) @@ -1025,7 +1024,7 @@
* plaintext v. HTML file.
-menu_save_as_cb(gpointer data, guint action, GtkWidget *widget)+menu_save_as_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
@@ -1055,7 +1054,7 @@
-menu_view_log_cb(gpointer data, guint action, GtkWidget *widget)+menu_view_log_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv;
@@ -1082,7 +1081,9 @@
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)));
name = purple_conversation_get_name(conv);
account = purple_conversation_get_account(conv);
@@ -1109,7 +1110,7 @@
-menu_clear_cb(gpointer data, guint action, GtkWidget *widget)+menu_clear_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv;
@@ -1119,7 +1120,7 @@
-menu_find_cb(gpointer data, guint action, GtkWidget *widget)+menu_find_cb(GtkAction *action, gpointer data) PidginWindow *gtkwin = data;
PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(gtkwin);
@@ -1129,7 +1130,7 @@
-menu_initiate_media_call_cb(gpointer data, guint action, GtkWidget *widget)+menu_initiate_media_call_cb(GtkAction *action, gpointer data) PidginWindow *win = (PidginWindow *)data;
PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
@@ -1137,15 +1138,15 @@
purple_prpl_initiate_media(account,
purple_conversation_get_name(conv),
- action == 0 ? PURPLE_MEDIA_AUDIO :- action == 1 ? PURPLE_MEDIA_VIDEO :- action == 2 ? PURPLE_MEDIA_AUDIO |+ action == win->audio_call ? PURPLE_MEDIA_AUDIO : + action == win->video_call ? PURPLE_MEDIA_VIDEO : + action == win->audio_video_call ? PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO : PURPLE_MEDIA_NONE);
-menu_send_file_cb(gpointer data, guint action, GtkWidget *widget)+menu_send_file_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
@@ -1157,7 +1158,7 @@
-menu_get_attention_cb(gpointer data, guint action, GtkWidget *widget)+menu_get_attention_cb(GtkAction *ation, gpointer data) PidginWindow *win = data;
PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
@@ -1169,7 +1170,7 @@
-menu_add_pounce_cb(gpointer data, guint action, GtkWidget *widget)+menu_add_pounce_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv;
@@ -1181,7 +1182,7 @@
-menu_insert_link_cb(gpointer data, guint action, GtkWidget *widget)+menu_insert_link_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PidginConversation *gtkconv;
@@ -1195,7 +1196,7 @@
-menu_insert_image_cb(gpointer data, guint action, GtkWidget *widget)+menu_insert_image_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PidginConversation *gtkconv;
@@ -1210,7 +1211,7 @@
-menu_alias_cb(gpointer data, guint action, GtkWidget *widget)+menu_alias_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv;
@@ -1237,7 +1238,7 @@
-menu_get_info_cb(gpointer data, guint action, GtkWidget *widget)+menu_get_info_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv;
@@ -1248,7 +1249,7 @@
-menu_invite_cb(gpointer data, guint action, GtkWidget *widget)+menu_invite_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv;
@@ -1259,7 +1260,7 @@
-menu_block_cb(gpointer data, guint action, GtkWidget *widget)+menu_block_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv;
@@ -1270,7 +1271,7 @@
-menu_unblock_cb(gpointer data, guint action, GtkWidget *widget)+menu_unblock_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv;
@@ -1281,7 +1282,7 @@
-menu_add_remove_cb(gpointer data, guint action, GtkWidget *widget)+menu_add_remove_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv;
@@ -1326,7 +1327,7 @@
-menu_close_conv_cb(gpointer data, guint action, GtkWidget *widget)+menu_close_conv_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
@@ -1334,7 +1335,7 @@
-menu_logging_cb(gpointer data, guint action, GtkWidget *widget)+menu_logging_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv;
@@ -1346,7 +1347,7 @@
- logging = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));+ logging = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)); if (logging == purple_conversation_is_logging(conv))
@@ -1399,14 +1400,14 @@
-menu_toolbar_cb(gpointer data, guint action, GtkWidget *widget)+menu_toolbar_cb(GtkAction *action, gpointer data) purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar",
- gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)));-menu_sounds_cb(gpointer data, guint action, GtkWidget *widget)+ gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action))); +menu_sounds_cb(GtkAction *action, gpointer data) PidginWindow *win = data;
PurpleConversation *conv;
@@ -1421,17 +1422,17 @@
gtkconv = PIDGIN_CONVERSATION(conv);
- gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));+ gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)); node = get_conversation_blist_node(conv);
purple_blist_node_set_bool(node, "gtk-mute-sound", !gtkconv->make_sound);
-menu_timestamps_cb(gpointer data, guint action, GtkWidget *widget)+menu_timestamps_cb(GtkAction *action, gpointer data) purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps",
- gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)));+ gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action))); @@ -2236,7 +2237,7 @@
gtkconv->active_conv = conv;
purple_conversation_set_logging(conv,
- gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(gtkconv->win->menu.logging)));+ gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(gtkconv->win->menu.logging))); entry = GTK_IMHTML(gtkconv->entry);
protocol_name = purple_account_get_protocol_name(conv->account);
@@ -3050,6 +3051,101 @@
+static GtkActionEntry menu_entries[] = +/* TODO: fill out tooltips... */ + /* Conversation menu */ + { "ConversationMenu", NULL, N_("_Conversation"), NULL, NULL, NULL }, + { "NewInstantMessage", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, N_("New Instant _Message..."), "<control>M", NULL, G_CALLBACK(menu_new_conv_cb) }, + { "Find", GTK_STOCK_FIND, N_("_Find..."), NULL, NULL, G_CALLBACK(menu_find_cb) }, + { "ViewLog", NULL, N_("View _Log"), NULL, NULL, G_CALLBACK(menu_view_log_cb) }, + { "SaveAs", GTK_STOCK_SAVE_AS, N_("_Save As..."), NULL, NULL, G_CALLBACK(menu_save_as_cb) }, + { "ClearScrollback", GTK_STOCK_CLEAR, N_("Clea_r Scrollback"), "<control>L", NULL, G_CALLBACK(menu_clear_cb) }, + { "MediaMenu", NULL, N_("M_edia"), NULL, NULL, NULL }, + { "AudioCall", PIDGIN_STOCK_TOOLBAR_AUDIO_CALL, N_("_Audio Call"), NULL, NULL, G_CALLBACK(menu_initiate_media_call_cb) }, + { "VideoCall", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL, N_("_Video Call"), NULL, NULL, G_CALLBACK(menu_initiate_media_call_cb) }, + { "AudioVideoCall", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL, N_("Audio\\/Video _Call"), NULL, NULL, G_CALLBACK(menu_initiate_media_call_cb) }, + { "SendFile", PIDGIN_STOCK_TOOLBAR_SEND_FILE, N_("Se_nd File..."), NULL, NULL, G_CALLBACK(menu_send_file_cb) }, + { "GetAttention", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION, N_("Get _Attention"), NULL, NULL, G_CALLBACK(menu_get_attention_cb) }, + { "AddBuddyPounce", NULL, N_("Add Buddy _Pounce..."), NULL, NULL, G_CALLBACK(menu_add_pounce_cb) }, + { "GetInfo", PIDGIN_STOCK_TOOLBAR_USER_INFO, N_("_Get Info"), "<control>O", NULL, G_CALLBACK(menu_get_info_cb) }, + { "Invite", NULL, N_("In_vite..."), NULL, NULL, G_CALLBACK(menu_invite_cb) }, + { "MoreMenu", NULL, N_("M_ore"), NULL, NULL, NULL }, + { "Alias", NULL, N_("Al_ias..."), NULL, NULL, G_CALLBACK(menu_alias_cb) }, + { "Block", PIDGIN_STOCK_TOOLBAR_BLOCK, N_("_Block..."), NULL, NULL, G_CALLBACK(menu_block_cb) }, + { "Unblock", PIDGIN_STOCK_TOOLBAR_UNBLOCK, N_("_Unblock..."), NULL, NULL, G_CALLBACK(menu_unblock_cb) }, + { "Add", GTK_STOCK_ADD, N_("_Add..."), NULL, NULL, G_CALLBACK(menu_add_remove_cb) }, + { "Remove", GTK_STOCK_REMOVE, N_("_Remove..."), NULL, NULL, G_CALLBACK(menu_add_remove_cb) }, + { "InsertLink", PIDGIN_STOCK_TOOLBAR_INSERT_LINK, N_("Insert Lin_k..."), NULL, NULL, G_CALLBACK(menu_insert_link_cb) }, + { "InsertImage", PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, N_("Insert Imag_e..."), NULL, NULL, G_CALLBACK(menu_insert_image_cb) }, + { "Close", GTK_STOCK_CLOSE, N_("_Close"), NULL, NULL, G_CALLBACK(menu_close_conv_cb) }, + { "OptionsMenu", NULL, N_("_Options"), NULL, NULL, NULL }, +static const GtkToggleActionEntry menu_toggle_entries[] = { + { "EnableLogging", NULL, N_("Enable _Logging"), NULL, NULL, G_CALLBACK(menu_logging_cb), FALSE }, + { "EnableSounds", NULL, N_("Enable _Sounds"), NULL, NULL, G_CALLBACK(menu_sounds_cb), FALSE }, + { "ShowFormattingToolbars", NULL, N_("Show Formatting _Toolbars"), NULL, NULL, G_CALLBACK(menu_toolbar_cb), FALSE }, + { "ShowTimestamps", NULL, N_("Show Ti_mestamps"), NULL, NULL, G_CALLBACK(menu_timestamps_cb), FALSE }, +static const char *conversation_menu = + "<menubar name='Conversation'>" + "<menu action='ConversationMenu'>" + "<menuitem action='NewInstantMessage'/>" + "<menuitem action='Find'/>" + "<menuitem action='ViewLog'/>" + "<menuitem action='SaveAs'/>" + "<menuitem action='ClearScrollback'/>" + "<menu action='MediaMenu'>" + "<menuitem action='AudioCall'/>" + "<menuitem action='VideoCall'/>" + "<menuitem action='AudioVideoCall'/>" + "<menuitem action='SendFile'/>" + "<menuitem action='GetAttention'/>" + "<menuitem action='AddBuddyPounce'/>" + "<menuitem action='GetInfo'/>" + "<menuitem action='Invite'/>" + "<menu action='MoreMenu'/>" + "<menuitem action='Alias'/>" + "<menuitem action='Block'/>" + "<menuitem action='Unblock'/>" + "<menuitem action='Add'/>" + "<menuitem action='Remove'/>" + "<menuitem action='InsertLink'/>" + "<menuitem action='InsertImage'/>" + "<menuitem action='Close'/>" + "<menu action='OptionsMenu'>" + "<menuitem action='EnableLogging'/>" + "<menuitem action='EnableSounds'/>" + "<menuitem action='ShowFormattingToolbars'/>" + "<menuitem action='ShowTimestamps'/>" static GtkItemFactoryEntry menu_items[] =
@@ -3126,15 +3222,7 @@
{ N_("/Options/Show Formatting _Toolbars"), NULL, menu_toolbar_cb, 0, "<CheckItem>", NULL },
{ N_("/Options/Show Ti_mestamps"), NULL, menu_timestamps_cb, 0, "<CheckItem>", NULL },
-static const int menu_item_count =-sizeof(menu_items) / sizeof(*menu_items);-item_factory_translate_func (const char *path, gpointer func_data) sound_method_pref_changed_cb(const char *name, PurplePrefType type,
@@ -3145,19 +3233,18 @@
if (!strcmp(method, "none"))
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds),- gtk_widget_set_sensitive(win->menu.sounds, FALSE);+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(win->menu.sounds), + gtk_action_set_sensitive(win->menu.sounds, FALSE); PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win);
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds),- gtk_widget_set_sensitive(win->menu.sounds, TRUE);+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(win->menu.sounds), + gtk_action_set_sensitive(win->menu.sounds, TRUE); @@ -3285,25 +3372,25 @@
purple_prpl_get_media_caps(account,
purple_conversation_get_name(conv));
- gtk_widget_set_sensitive(win->audio_call,+ gtk_action_set_sensitive(win->audio_call, caps & PURPLE_MEDIA_CAPS_AUDIO
- gtk_widget_set_sensitive(win->video_call,+ gtk_action_set_sensitive(win->video_call, caps & PURPLE_MEDIA_CAPS_VIDEO
- gtk_widget_set_sensitive(win->audio_video_call, + gtk_action_set_sensitive(win->audio_video_call, caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO
} else if (purple_conversation_get_type(conv)
== PURPLE_CONV_TYPE_CHAT) {
/* for now, don't care about chats... */
- gtk_widget_set_sensitive(win->audio_call, FALSE);- gtk_widget_set_sensitive(win->video_call, FALSE);- gtk_widget_set_sensitive(win->audio_video_call, FALSE);+ gtk_action_set_sensitive(win->audio_call, FALSE); + gtk_action_set_sensitive(win->video_call, FALSE); + gtk_action_set_sensitive(win->audio_video_call, FALSE); - gtk_widget_set_sensitive(win->audio_call, FALSE);- gtk_widget_set_sensitive(win->video_call, FALSE);- gtk_widget_set_sensitive(win->audio_video_call, FALSE);+ gtk_action_set_sensitive(win->audio_call, FALSE); + gtk_action_set_sensitive(win->video_call, FALSE); + gtk_action_set_sensitive(win->audio_video_call, FALSE); @@ -3311,6 +3398,8 @@
regenerate_options_items(PidginWindow *win)
+#if GTK_CHECK_VERSION(2,6,0) PidginConversation *gtkconv;
@@ -3334,6 +3423,7 @@
gtk_widget_show_all(menu);
@@ -3347,6 +3437,8 @@
regenerate_plugins_items(PidginWindow *win)
+#if GTK_CHECK_VERSION(2,6,0) @@ -3388,8 +3480,10 @@
g_signal_connect(G_OBJECT(item), "destroy", G_CALLBACK(remove_from_list), win);
g_object_set_data(G_OBJECT(win->window), "plugin-actions", action_items);
static void menubar_activated(GtkWidget *item, gpointer data)
PidginWindow *win = data;
@@ -3413,134 +3507,141 @@
g_signal_handlers_disconnect_by_func(G_OBJECT(win->menu.menubar),
G_CALLBACK(focus_out_from_menubar), win);
setup_menubar(PidginWindow *win)
GtkAccelGroup *accel_group;
- accel_group = gtk_accel_group_new ();+ GtkActionGroup *action_group; + action_group = gtk_action_group_new("ConversationActions"); + gtk_action_group_add_actions(action_group, + G_N_ELEMENTS(menu_entries), + gtk_action_group_add_toggle_actions(action_group, + G_N_ELEMENTS(menu_toggle_entries), + gtk_action_group_set_translation_domain(action_group, + win->menu.ui = gtk_ui_manager_new(); + gtk_ui_manager_insert_action_group(win->menu.ui, action_group, 0); + accel_group = gtk_ui_manager_get_accel_group(win->menu.ui); gtk_window_add_accel_group(GTK_WINDOW(win->window), accel_group);
- g_object_unref(accel_group);- win->menu.item_factory =- gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group);- gtk_item_factory_set_translate_func(win->menu.item_factory,- (GtkTranslateFunc)item_factory_translate_func,- gtk_item_factory_create_items(win->menu.item_factory, menu_item_count, g_signal_connect(G_OBJECT(accel_group), "accel-changed",
G_CALLBACK(pidgin_save_accels_cb), NULL);
- /* Make sure the 'Conversation -> More' menuitems are regenerated whenever- * the 'Conversation' menu pops up because the entries can change after the- * conversation is created. */- menuitem = gtk_item_factory_get_item(win->menu.item_factory, N_("/Conversation"));- g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(menubar_activated), win);+ if (!gtk_ui_manager_add_ui_from_string(win->menu.ui, conversation_menu, -1, &error)) + g_message("building menus failed: %s", error->message); - gtk_item_factory_get_widget(win->menu.item_factory, "<main>");+ gtk_ui_manager_get_widget(win->menu.ui, "/Conversation"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/View Log"));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/ViewLog"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Media/Audio Call"));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/MediaMenu/AudioCall"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Media/Video Call"));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/MediaMenu/VideoCall"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Media/Audio\\/Video Call"));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/MediaMenu/AudioVideoCall"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Send File..."));- g_object_set_data(G_OBJECT(win->window), "get_attention",- gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Get Attention")));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/SendFile"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Add Buddy Pounce..."));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/AddBuddyPounce"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Get Info"));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/GetInfo"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Invite..."));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/Invite"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Alias..."));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/Alias"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Block..."));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/Block"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Unblock..."));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/Unblock"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Add..."));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/Add"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Remove..."));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/Remove"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Insert Link..."));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/InsertLink"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Conversation/Insert Image..."));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/InsertImage"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Options/Enable Logging"));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/OptionsMenu/EnableLogging"); - gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Options/Enable Sounds"));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/OptionsMenu/EnableSounds"); method = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method");
if (method != NULL && !strcmp(method, "none"))
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds),+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(win->menu.sounds), - gtk_widget_set_sensitive(win->menu.sounds, FALSE);+ gtk_action_set_sensitive(win->menu.sounds, FALSE); purple_prefs_connect_callback(win, PIDGIN_PREFS_ROOT "/sound/method",
sound_method_pref_changed_cb, win);
win->menu.show_formatting_toolbar =
- gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Options/Show Formatting Toolbars"));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/OptionsMenu/ShowFormattingToolbars"); win->menu.show_timestamps =
- gtk_item_factory_get_widget(win->menu.item_factory,- N_("/Options/Show Timestamps"));+ gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/OptionsMenu/ShowTimestamps"); win->menu.show_icon = NULL;
win->menu.tray = pidgin_menu_tray_new();
@@ -3721,7 +3822,7 @@
if (!(b = purple_find_buddy(account, conv->name)))
gtk_widget_show(win->menu.send_to);
menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(win->menu.send_to));
@@ -3743,6 +3844,7 @@
@@ -3852,6 +3954,7 @@
generate_send_to_items(PidginWindow *win)
GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -3936,6 +4039,7 @@
gtk_widget_set_sensitive(win->menu.send_to, FALSE);
update_send_to_selection(win);
@@ -4861,8 +4965,12 @@
close = pidgin_create_small_button(gtk_label_new("×"));
gtk_box_pack_start(GTK_BOX(widget), close, FALSE, FALSE, 0);
+#if GTK_CHECK_VERSION(2,12,0) + gtk_widget_set_tooltip_text(close, _("Close Find bar")); gtk_tooltips_set_tip(gtkconv->tooltips, close,
_("Close Find bar"), NULL);
label = gtk_label_new(_("Find:"));
gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 10);
@@ -5318,7 +5426,9 @@
gtkconv->send_history = g_list_append(NULL, NULL);
/* Setup some initial variables. */
+#if !GTK_CHECK_VERSION(2,12,0) gtkconv->tooltips = gtk_tooltips_new();
gtkconv->unseen_state = PIDGIN_UNSEEN_NONE;
gtkconv->unseen_count = 0;
@@ -5521,7 +5631,9 @@
+#if !GTK_CHECK_VERSION(2,12,0) gtk_object_sink(GTK_OBJECT(gtkconv->tooltips));
gtkconv->send_history = g_list_first(gtkconv->send_history);
g_list_foreach(gtkconv->send_history, (GFunc)g_free, NULL);
@@ -6466,57 +6578,57 @@
/* Show stuff that applies to IMs, hide stuff that applies to chats */
/* Deal with menu items */
- gtk_widget_show(win->menu.view_log);- gtk_widget_show(win->menu.send_file);- gtk_widget_show(g_object_get_data(G_OBJECT(win->window), "get_attention"));- gtk_widget_show(win->menu.add_pounce);- gtk_widget_show(win->menu.get_info);- gtk_widget_hide(win->menu.invite);- gtk_widget_show(win->menu.alias);+ gtk_action_set_visible(win->menu.view_log, TRUE); + gtk_action_set_visible(win->menu.send_file, TRUE); + gtk_action_set_visible(g_object_get_data(G_OBJECT(win->window), "get_attention"), TRUE); + gtk_action_set_visible(win->menu.add_pounce, TRUE); + gtk_action_set_visible(win->menu.get_info, TRUE); + gtk_action_set_visible(win->menu.invite, FALSE); + gtk_action_set_visible(win->menu.alias, TRUE); if (purple_privacy_check(account, purple_conversation_get_name(conv))) {
- gtk_widget_hide(win->menu.unblock);- gtk_widget_show(win->menu.block);+ gtk_action_set_visible(win->menu.unblock, FALSE); + gtk_action_set_visible(win->menu.block, TRUE); - gtk_widget_hide(win->menu.block);- gtk_widget_show(win->menu.unblock);+ gtk_action_set_visible(win->menu.block, FALSE); + gtk_action_set_visible(win->menu.unblock, TRUE); if ((account == NULL) || purple_find_buddy(account, purple_conversation_get_name(conv)) == NULL) {
- gtk_widget_show(win->menu.add);- gtk_widget_hide(win->menu.remove);+ gtk_action_set_visible(win->menu.add, TRUE); + gtk_action_set_visible(win->menu.remove, FALSE); - gtk_widget_show(win->menu.remove);- gtk_widget_hide(win->menu.add);- gtk_widget_show(win->menu.insert_link);- gtk_widget_show(win->menu.insert_image);+ gtk_action_set_visible(win->menu.remove, TRUE); + gtk_action_set_visible(win->menu.add, FALSE); + gtk_action_set_visible(win->menu.insert_link, TRUE); + gtk_action_set_visible(win->menu.insert_image, TRUE); } else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
/* Show stuff that applies to Chats, hide stuff that applies to IMs */
/* Deal with menu items */
- gtk_widget_show(win->menu.view_log);- gtk_widget_hide(win->menu.send_file);- gtk_widget_hide(g_object_get_data(G_OBJECT(win->window), "get_attention"));- gtk_widget_hide(win->menu.add_pounce);- gtk_widget_hide(win->menu.get_info);- gtk_widget_show(win->menu.invite);- gtk_widget_show(win->menu.alias);- gtk_widget_hide(win->menu.block);- gtk_widget_hide(win->menu.unblock);+ gtk_action_set_visible(win->menu.view_log, TRUE); + gtk_action_set_visible(win->menu.send_file, FALSE); + gtk_action_set_visible(g_object_get_data(G_OBJECT(win->window), "get_attention"), FALSE); + gtk_action_set_visible(win->menu.add_pounce, FALSE); + gtk_action_set_visible(win->menu.get_info, FALSE); + gtk_action_set_visible(win->menu.invite, TRUE); + gtk_action_set_visible(win->menu.alias, TRUE); + gtk_action_set_visible(win->menu.block, FALSE); + gtk_action_set_visible(win->menu.unblock, FALSE); if ((account == NULL) || purple_blist_find_chat(account, purple_conversation_get_name(conv)) == NULL) {
/* If the chat is NOT in the buddy list */
- gtk_widget_show(win->menu.add);- gtk_widget_hide(win->menu.remove);+ gtk_action_set_visible(win->menu.add, TRUE); + gtk_action_set_visible(win->menu.remove, FALSE); /* If the chat IS in the buddy list */
- gtk_widget_hide(win->menu.add);- gtk_widget_show(win->menu.remove);- gtk_widget_show(win->menu.insert_link);- gtk_widget_show(win->menu.insert_image);+ gtk_action_set_visible(win->menu.add, FALSE); + gtk_action_set_visible(win->menu.remove, TRUE); + gtk_action_set_visible(win->menu.insert_link, TRUE); + gtk_action_set_visible(win->menu.insert_image, TRUE); @@ -6561,30 +6673,30 @@
gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(gtkconv->toolbar), purple_account_get_protocol_id(account));
/* Deal with menu items */
- gtk_widget_set_sensitive(win->menu.view_log, TRUE);- gtk_widget_set_sensitive(win->menu.add_pounce, TRUE);- gtk_widget_set_sensitive(win->menu.get_info, (prpl_info->get_info != NULL));- gtk_widget_set_sensitive(win->menu.invite, (prpl_info->chat_invite != NULL));- gtk_widget_set_sensitive(win->menu.insert_link, (conv->features & PURPLE_CONNECTION_HTML));- gtk_widget_set_sensitive(win->menu.insert_image, !(conv->features & PURPLE_CONNECTION_NO_IMAGES));+ gtk_action_set_sensitive(win->menu.view_log, TRUE); + gtk_action_set_sensitive(win->menu.add_pounce, TRUE); + gtk_action_set_sensitive(win->menu.get_info, (prpl_info->get_info != NULL)); + gtk_action_set_sensitive(win->menu.invite, (prpl_info->chat_invite != NULL)); + gtk_action_set_sensitive(win->menu.insert_link, (conv->features & PURPLE_CONNECTION_HTML)); + gtk_action_set_sensitive(win->menu.insert_image, !(conv->features & PURPLE_CONNECTION_NO_IMAGES)); if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
- gtk_widget_set_sensitive(win->menu.add, (prpl_info->add_buddy != NULL));- gtk_widget_set_sensitive(win->menu.remove, (prpl_info->remove_buddy != NULL));- gtk_widget_set_sensitive(win->menu.send_file,+ gtk_action_set_sensitive(win->menu.add, (prpl_info->add_buddy != NULL)); + gtk_action_set_sensitive(win->menu.remove, (prpl_info->remove_buddy != NULL)); + gtk_action_set_sensitive(win->menu.send_file, (prpl_info->send_file != NULL && (!prpl_info->can_receive_file ||
prpl_info->can_receive_file(gc, purple_conversation_get_name(conv)))));
- gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(win->window), "get_attention"), (prpl_info->send_attention != NULL));- gtk_widget_set_sensitive(win->menu.alias,+ gtk_action_set_sensitive(g_object_get_data(G_OBJECT(win->window), "get_attention"), (prpl_info->send_attention != NULL)); + gtk_action_set_sensitive(win->menu.alias, (purple_find_buddy(account, purple_conversation_get_name(conv)) != NULL));
else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT)
- gtk_widget_set_sensitive(win->menu.add, (prpl_info->join_chat != NULL));- gtk_widget_set_sensitive(win->menu.remove, (prpl_info->join_chat != NULL));- gtk_widget_set_sensitive(win->menu.alias,+ gtk_action_set_sensitive(win->menu.add, (prpl_info->join_chat != NULL)); + gtk_action_set_sensitive(win->menu.remove, (prpl_info->join_chat != NULL)); + gtk_action_set_sensitive(win->menu.alias, (purple_blist_find_chat(account, purple_conversation_get_name(conv)) != NULL));
@@ -6594,18 +6706,18 @@
/* Or it's a chat that we've left. */
/* Then deal with menu items */
- gtk_widget_set_sensitive(win->menu.view_log, TRUE);- gtk_widget_set_sensitive(win->menu.send_file, FALSE);- gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(win->window),+ gtk_action_set_sensitive(win->menu.view_log, TRUE); + gtk_action_set_sensitive(win->menu.send_file, FALSE); + gtk_action_set_sensitive(g_object_get_data(G_OBJECT(win->window), "get_attention"), FALSE);
- gtk_widget_set_sensitive(win->menu.add_pounce, TRUE);- gtk_widget_set_sensitive(win->menu.get_info, FALSE);- gtk_widget_set_sensitive(win->menu.invite, FALSE);- gtk_widget_set_sensitive(win->menu.alias, FALSE);- gtk_widget_set_sensitive(win->menu.add, FALSE);- gtk_widget_set_sensitive(win->menu.remove, FALSE);- gtk_widget_set_sensitive(win->menu.insert_link, TRUE);- gtk_widget_set_sensitive(win->menu.insert_image, FALSE);+ gtk_action_set_sensitive(win->menu.add_pounce, TRUE); + gtk_action_set_sensitive(win->menu.get_info, FALSE); + gtk_action_set_sensitive(win->menu.invite, FALSE); + gtk_action_set_sensitive(win->menu.alias, FALSE); + gtk_action_set_sensitive(win->menu.add, FALSE); + gtk_action_set_sensitive(win->menu.remove, FALSE); + gtk_action_set_sensitive(win->menu.insert_link, TRUE); + gtk_action_set_sensitive(win->menu.insert_image, FALSE); @@ -6685,8 +6797,13 @@
topic = purple_conv_chat_get_topic(chat);
gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), topic ? topic : "");
+#if GTK_CHECK_VERSION(2,12,0) + gtk_widget_set_tooltip_text(gtkchat->topic_text, gtk_tooltips_set_tip(gtkconv->tooltips, gtkchat->topic_text,
topic ? topic : "", NULL);
@@ -7283,8 +7400,8 @@
gtkconv = PIDGIN_CONVERSATION(conv);
- gtk_check_menu_item_set_active(- GTK_CHECK_MENU_ITEM(win->menu.show_timestamps),+ gtk_toggle_action_set_active( + GTK_TOGGLE_ACTION(win->menu.show_timestamps), (gboolean)GPOINTER_TO_INT(value));
gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml),
@@ -7311,8 +7428,8 @@
gtkconv = PIDGIN_CONVERSATION(conv);
- gtk_check_menu_item_set_active(- GTK_CHECK_MENU_ITEM(win->menu.show_formatting_toolbar),+ gtk_toggle_action_set_active( + GTK_TOGGLE_ACTION(win->menu.show_formatting_toolbar), (gboolean)GPOINTER_TO_INT(value));
if ((gboolean)GPOINTER_TO_INT(value))
@@ -8569,6 +8686,7 @@
/* Right click was pressed. Popup the context menu. */
GtkWidget *menu = gtk_menu_new(), *sub;
gboolean populated = populate_menu_with_options(menu, gtkconv, TRUE);
sub = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtkconv->win->menu.send_to));
if (sub && GTK_WIDGET_IS_SENSITIVE(gtkconv->win->menu.send_to)) {
@@ -8583,7 +8701,7 @@
gtk_widget_destroy(menu);
gtk_widget_show_all(menu);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, e->button, e->time);
@@ -9088,8 +9206,8 @@
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtkconv->win->menu.logging),- purple_conversation_is_logging(conv));+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtkconv->win->menu.logging), + purple_conversation_is_logging(conv)); generate_send_to_items(win);
regenerate_options_items(win);
@@ -9099,14 +9217,14 @@
sound_method = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method");
if (strcmp(sound_method, "none") != 0)
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds),- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_formatting_toolbar),- purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar"));- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_timestamps),- purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps"));+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(win->menu.sounds), + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(win->menu.show_formatting_toolbar), + purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar")); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(win->menu.show_timestamps), + purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps")); * We pause icons when they are not visible. If this icon should
@@ -9356,7 +9474,7 @@
gtk_widget_destroy(win->window);
- g_object_unref(G_OBJECT(win->menu.item_factory));+ g_object_unref(G_OBJECT(win->menu.ui)); purple_notify_close_with_handle(win);
purple_signals_disconnect_by_handle(win);
@@ -9434,8 +9552,12 @@
gtkconv->close = pidgin_create_small_button(gtk_label_new("×"));
+#if GTK_CHECK_VERSION(2,12,0) + gtk_widget_set_tooltip_text(gtkconv->close, _("Close conversation")); gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,
_("Close conversation"), NULL);
g_signal_connect(gtkconv->close, "clicked", G_CALLBACK (close_conv_cb), gtkconv);
@@ -9597,8 +9719,12 @@
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)); g_object_ref(gtkconv->tab_cont);
gtk_object_sink(GTK_OBJECT(gtkconv->tab_cont));
gtk_notebook_remove_page(GTK_NOTEBOOK(win->notebook), index);
--- a/pidgin/gtkimhtmltoolbar.c Sat Nov 20 09:21:29 2010 +0000
+++ b/pidgin/gtkimhtmltoolbar.c Sat Nov 20 22:20:35 2010 +0000
@@ -658,7 +658,11 @@
g_object_set_data(G_OBJECT(button), "smiley_text", face);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(insert_smiley_text), toolbar);
+#if GTK_CHECK_VERSION(2,12,0) + gtk_widget_set_tooltip_text(button, face); gtk_tooltips_set_tip(toolbar->tooltips, button, face, NULL);
/* these look really weird with borders */
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
@@ -672,7 +676,11 @@
g_snprintf(tip, sizeof(tip),
_("This smiley is disabled because a custom smiley exists for this shortcut:\n %s"),
+#if GTK_CHECK_VERSION(2,12,0) + gtk_widget_set_tooltip_text(button, tip); gtk_tooltips_set_tip(toolbar->tooltips, button, tip, NULL);
gtk_widget_set_sensitive(button, FALSE);
/* Remove the button if the smiley is destroyed */
@@ -1158,7 +1166,9 @@
+#if !GTK_CHECK_VERSION(2,12,0) gtk_object_sink(GTK_OBJECT(toolbar->tooltips));
menu = g_object_get_data(object, "font_menu");
@@ -1255,7 +1265,11 @@
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(buttons[iter].callback), toolbar);
*(buttons[iter].button) = button;
+#if GTK_CHECK_VERSION(2,12,0) + gtk_widget_set_tooltip_text(button, buttons[iter].tooltip); gtk_tooltips_set_tip(toolbar->tooltips, button, buttons[iter].tooltip, NULL);
button = gtk_vseparator_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -1266,7 +1280,11 @@
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(send_attention_cb), toolbar);
g_object_set_data(G_OBJECT(toolbar), "attention", button);
+#if GTK_CHECK_VERSION(2,12,0) + gtk_widget_set_tooltip_text(button, _("Send Attention")); gtk_tooltips_set_tip(toolbar->tooltips, button, _("Send Attention"), NULL);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(toolbar), hbox, FALSE, FALSE, 0);
@@ -1364,7 +1382,9 @@
toolbar->smiley_dialog = NULL;
toolbar->image_dialog = NULL;
+#if !GTK_CHECK_VERSION(2,12,0) toolbar->tooltips = gtk_tooltips_new();
gtk_box_set_spacing(GTK_BOX(toolbar), 3);
--- a/pidgin/gtkutils.c Sat Nov 20 09:21:29 2010 +0000
+++ b/pidgin/gtkutils.c Sat Nov 20 22:20:35 2010 +0000
@@ -70,7 +70,7 @@
#include "pidgin/minidialog.h"
@@ -527,68 +527,35 @@
-aop_option_menu_get_selected(GtkWidget *optmenu, GtkWidget **p_item)+aop_option_menu_get_selected(GtkWidget *optmenu) - GtkWidget *menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu));- GtkWidget *item = gtk_menu_get_active(GTK_MENU(menu));- return item ? g_object_get_data(G_OBJECT(item), "aop_per_item_data") : NULL;+ g_return_val_if_fail(optmenu != NULL, NULL); + if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(optmenu), &iter)) + gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)), &iter, 2, &data, -1); aop_menu_cb(GtkWidget *optmenu, GCallback cb)
- gpointer per_item_data;- per_item_data = aop_option_menu_get_selected(optmenu, &item);- ((void (*)(GtkWidget *, gpointer, gpointer))cb)(item, per_item_data, g_object_get_data(G_OBJECT(optmenu), "user_data"));+ ((void (*)(GtkWidget *, gpointer, gpointer))cb)(optmenu, + aop_option_menu_get_selected(optmenu), + g_object_get_data(G_OBJECT(optmenu), "user_data"));
-aop_menu_item_new(GtkSizeGroup *sg, GdkPixbuf *pixbuf, const char *lbl, gpointer per_item_data, const char *data)+aop_option_menu_replace_menu(GtkWidget *optmenu, AopMenu *new_aop_menu)
- item = gtk_menu_item_new();- hbox = gtk_hbox_new(FALSE, 4);- image = gtk_image_new();- image = gtk_image_new_from_pixbuf(pixbuf);- gtk_widget_show(image);- gtk_size_group_add_widget(sg, image);- label = gtk_label_new (lbl);- gtk_widget_show (label);- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);- gtk_container_add(GTK_CONTAINER(item), hbox);- gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);- gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);- g_object_set_data(G_OBJECT (item), data, per_item_data);- g_object_set_data(G_OBJECT (item), "aop_per_item_data", per_item_data);- pidgin_set_accessible_label(item, label);+ gtk_combo_box_set_model(GTK_COMBO_BOX(optmenu), new_aop_menu->model); + gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), new_aop_menu->default_item); + g_object_set_data_full(G_OBJECT(optmenu), "aop_menu", new_aop_menu, (GDestroyNotify)g_free); @@ -629,16 +596,19 @@
aop_option_menu_new(AopMenu *aop_menu, GCallback cb, gpointer user_data)
- optmenu = gtk_option_menu_new();+ GtkWidget *optmenu = NULL; + GtkCellRenderer *cr = NULL; + optmenu = gtk_combo_box_new(); gtk_widget_show(optmenu);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), aop_menu->menu);- if (aop_menu->default_item != -1)- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), aop_menu->default_item);- g_object_set_data_full(G_OBJECT(optmenu), "aop_menu", aop_menu, (GDestroyNotify)g_free);+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(optmenu), cr = gtk_cell_renderer_pixbuf_new(), FALSE); + gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(optmenu), cr, "pixbuf", 0); + gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(optmenu), cr = gtk_cell_renderer_text_new(), TRUE); + gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(optmenu), cr, "text", 1); + aop_option_menu_replace_menu(optmenu, aop_menu); + if (aop_menu->default_item == -1) + gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), 0); g_object_set_data(G_OBJECT(optmenu), "user_data", user_data);
g_signal_connect(G_OBJECT(optmenu), "changed", G_CALLBACK(aop_menu_cb), cb);
@@ -647,32 +617,20 @@
-aop_option_menu_replace_menu(GtkWidget *optmenu, AopMenu *new_aop_menu)- if (gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu)))- gtk_option_menu_remove_menu(GTK_OPTION_MENU(optmenu));- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), new_aop_menu->menu);- if (new_aop_menu->default_item != -1)- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), new_aop_menu->default_item);- g_object_set_data_full(G_OBJECT(optmenu), "aop_menu", new_aop_menu, (GDestroyNotify)g_free); aop_option_menu_select_by_data(GtkWidget *optmenu, gpointer data)
- for (idx = 0, llItr = GTK_MENU_SHELL(gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu)))->children;- llItr = llItr->next, idx++) {- if (data == g_object_get_data(G_OBJECT(llItr->data), "aop_per_item_data")) {- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), idx);+ model = gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)); + if (gtk_tree_model_get_iter_first(model, &iter)) { + gtk_tree_model_get(model, &iter, 2, &iter_data, -1); + if (iter_data == data) { + gtk_combo_box_set_active_iter(GTK_COMBO_BOX(optmenu), &iter); + } while (gtk_tree_model_iter_next(model, &iter)); @@ -682,16 +640,17 @@
AopMenu *aop_menu = NULL;
GdkPixbuf *pixbuf = NULL;
const char *gtalk_name = NULL;
+ ls = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER); aop_menu = g_malloc0(sizeof(AopMenu));
aop_menu->default_item = -1;
- aop_menu->menu = gtk_menu_new();- gtk_widget_show(aop_menu->menu);- sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);+ aop_menu->model = GTK_TREE_MODEL(ls); if (purple_find_prpl("prpl-jabber"))
gtalk_name = _("Google Talk");
@@ -705,14 +664,11 @@
if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
"16", "google-talk.png", NULL);
pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),- item = aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber", "protocol"));- g_object_set_data(G_OBJECT(item), "fake", GINT_TO_POINTER(1));+ gtk_list_store_append(ls, &iter); + gtk_list_store_set(ls, &iter, 0, pixbuf, 1, gtalk_name, 2, "prpl-jabber", -1); @@ -723,8 +679,8 @@
pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL);
- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),- aop_menu_item_new(sg, pixbuf, plugin->info->name, plugin->info->id, "protocol"));+ gtk_list_store_append(ls, &iter); + gtk_list_store_set(ls, &iter, 0, pixbuf, 1, plugin->info->name, 2, plugin->info->id, -1); @@ -732,9 +688,6 @@
if (default_proto_id != NULL && !strcmp(plugin->info->id, default_proto_id))
aop_menu->default_item = i;
@@ -748,13 +701,13 @@
pidgin_protocol_option_menu_get_selected(GtkWidget *optmenu)
- return (const char *)aop_option_menu_get_selected(optmenu, NULL);+ return (const char *)aop_option_menu_get_selected(optmenu); pidgin_account_option_menu_get_selected(GtkWidget *optmenu)
- return (PurpleAccount *)aop_option_menu_get_selected(optmenu, NULL);+ return (PurpleAccount *)aop_option_menu_get_selected(optmenu); @@ -766,7 +719,8 @@
GdkPixbuf *pixbuf = NULL;
@@ -775,11 +729,11 @@
list = purple_connections_get_all();
+ ls = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER); aop_menu = g_malloc0(sizeof(AopMenu));
aop_menu->default_item = -1;
- aop_menu->menu = gtk_menu_new();- gtk_widget_show(aop_menu->menu);- sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);+ aop_menu->model = GTK_TREE_MODEL(ls); for (p = list, i = 0; p != NULL; p = p->next, i++) {
@@ -814,8 +768,8 @@
purple_account_get_protocol_name(account));
- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),- aop_menu_item_new(sg, pixbuf, buf, account, "account"));+ gtk_list_store_append(ls, &iter); + gtk_list_store_set(ls, &iter, 0, pixbuf, 1, buf, 2, account, -1); @@ -823,9 +777,6 @@
if (default_account && account == default_account)
aop_menu->default_item = i;
@@ -836,7 +787,7 @@
PurpleFilterAccountFunc filter_func;
- account = (PurpleAccount *)aop_option_menu_get_selected(optmenu, NULL);+ account = (PurpleAccount *)aop_option_menu_get_selected(optmenu); show_all = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(optmenu), "show_all"));
filter_func = g_object_get_data(G_OBJECT(optmenu), "filter_func");
@@ -906,24 +857,6 @@
-pidgin_check_if_dir(const char *path, GtkFileSelection *filesel)- if (g_file_test(path, G_FILE_TEST_IS_DIR)) {- /* append a / if needed */- if (path[strlen(path) - 1] != G_DIR_SEPARATOR) {- dirname = g_strconcat(path, G_DIR_SEPARATOR_S, NULL);- gtk_file_selection_set_filename(filesel, (dirname != NULL) ? dirname : path); pidgin_setup_gtkspell(GtkTextView *textview)
