# HG changeset patch # User Gabriel Schulhof # Date 1185612614 0 # Node ID b9f5d8e147942561e950ec72a2a9d0762d7f696c # Parent d6a308e375b9a3365dc0cc1ad36c71067a02c9d1 Converting buddy list menu items. diff -r d6a308e375b9 -r b9f5d8e14794 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Tue Jul 24 20:28:29 2007 +0000 +++ b/pidgin/gtkblist.c Sat Jul 28 08:50:14 2007 +0000 @@ -522,11 +522,6 @@ } } -static void gtk_blist_show_systemlog_cb() -{ - pidgin_syslog_show(); -} - static void gtk_blist_show_onlinehelp_cb() { purple_notify_uri(NULL, PURPLE_WEBSITE "documentation"); @@ -2833,23 +2828,25 @@ } static void -blist_show_plugins_cb(GtkWidget *widget, gpointer null) -{ +pidgin_blist_show_no_param_dialog(gpointer p1, GCallback p2, gpointer p3) +{ + g_print("pidgin_blist_show_no_param_dialog: Entering\n"); pidgin_set_toplevel(GTK_WINDOW(gtkblist->window)); - pidgin_plugin_dialog_show(); + p2(); } /*************************************************** * Crap * ***************************************************/ + static GtkItemFactoryEntry blist_menu[] = { /* Buddies menu */ { N_("/_Buddies"), NULL, NULL, 0, "", NULL }, - { N_("/Buddies/New Instant _Message..."), "M", pidgin_dialogs_im, 0, "", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW }, - { N_("/Buddies/Join a _Chat..."), "C", pidgin_blist_joinchat_show, 0, "", NULL }, - { N_("/Buddies/Get User _Info..."), "I", pidgin_dialogs_info, 0, "", PIDGIN_STOCK_TOOLBAR_USER_INFO }, - { N_("/Buddies/View User _Log..."), "L", pidgin_dialogs_log, 0, "", NULL }, + { N_("/Buddies/New Instant _Message..."), "M", pidgin_blist_show_no_param_dialog, (guint)pidgin_dialogs_im, "", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW }, + { N_("/Buddies/Join a _Chat..."), "C", pidgin_blist_show_no_param_dialog, (guint)pidgin_blist_joinchat_show, "", NULL }, + { N_("/Buddies/Get User _Info..."), "I", pidgin_blist_show_no_param_dialog, (guint)pidgin_dialogs_info, "", PIDGIN_STOCK_TOOLBAR_USER_INFO }, + { N_("/Buddies/View User _Log..."), "L", pidgin_blist_show_no_param_dialog, (guint)pidgin_dialogs_log, "", NULL }, { "/Buddies/sep1", NULL, NULL, 0, "", NULL }, { N_("/Buddies/Show _Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "", NULL }, { N_("/Buddies/Show _Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "", NULL }, @@ -2857,26 +2854,26 @@ { N_("/Buddies/Show Idle _Times"), NULL, pidgin_blist_show_idle_time_cb, 1, "", NULL }, { N_("/Buddies/_Sort Buddies"), NULL, NULL, 0, "", NULL }, { "/Buddies/sep2", NULL, NULL, 0, "", NULL }, - { N_("/Buddies/_Add Buddy..."), "B", pidgin_blist_add_buddy_cb, 0, "", GTK_STOCK_ADD }, - { N_("/Buddies/Add C_hat..."), NULL, pidgin_blist_add_chat_cb, 0, "", GTK_STOCK_ADD }, - { N_("/Buddies/Add _Group..."), NULL, purple_blist_request_add_group, 0, "", GTK_STOCK_ADD }, + { N_("/Buddies/_Add Buddy..."), "B", pidgin_blist_show_no_param_dialog, (guint)pidgin_blist_add_buddy_cb, "", GTK_STOCK_ADD }, + { N_("/Buddies/Add C_hat..."), NULL, pidgin_blist_show_no_param_dialog, (guint)pidgin_blist_add_chat_cb, "", GTK_STOCK_ADD }, + { N_("/Buddies/Add _Group..."), NULL, pidgin_blist_show_no_param_dialog, (guint)purple_blist_request_add_group, "", GTK_STOCK_ADD }, { "/Buddies/sep3", NULL, NULL, 0, "", NULL }, { N_("/Buddies/_Quit"), "Q", purple_core_quit, 0, "", GTK_STOCK_QUIT }, /* Accounts menu */ { N_("/_Accounts"), NULL, NULL, 0, "", NULL }, - { N_("/Accounts/Add\\/Edit"), "A", pidgin_accounts_window_show, 0, "", NULL }, + { N_("/Accounts/Add\\/Edit"), "A", pidgin_blist_show_no_param_dialog, (guint)pidgin_accounts_window_show, "", NULL }, /* Tools */ { N_("/_Tools"), NULL, NULL, 0, "", NULL }, - { N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 0, "", NULL }, - { N_("/Tools/Plu_gins"), "U", blist_show_plugins_cb, 0, "", PIDGIN_STOCK_TOOLBAR_PLUGINS }, - { N_("/Tools/Pr_eferences"), "P", pidgin_prefs_show, 0, "", GTK_STOCK_PREFERENCES }, - { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "", NULL }, + { N_("/Tools/Buddy _Pounces"), NULL, pidgin_blist_show_no_param_dialog, (guint)pidgin_pounces_manager_show, "", NULL }, + { N_("/Tools/Plu_gins"), "U", pidgin_blist_show_no_param_dialog, (guint)pidgin_plugin_dialog_show, "", PIDGIN_STOCK_TOOLBAR_PLUGINS }, + { N_("/Tools/Pr_eferences"), "P", pidgin_blist_show_no_param_dialog, (guint)pidgin_prefs_show, "", GTK_STOCK_PREFERENCES }, + { N_("/Tools/Pr_ivacy"), NULL, pidgin_blist_show_no_param_dialog, (guint)pidgin_privacy_dialog_show, "", NULL }, { "/Tools/sep2", NULL, NULL, 0, "", NULL }, { N_("/Tools/_File Transfers"), "T", pidgin_xfer_dialog_show, 0, "", NULL }, - { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "", NULL }, - { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "", NULL }, + { N_("/Tools/R_oom List"), NULL, pidgin_blist_show_no_param_dialog, (guint)pidgin_roomlist_dialog_show, "", NULL }, + { N_("/Tools/System _Log"), NULL, pidgin_blist_show_no_param_dialog, (guint)pidgin_syslog_show, "", NULL }, { "/Tools/sep3", NULL, NULL, 0, "", NULL }, { N_("/Tools/Mute _Sounds"), "S", pidgin_blist_mute_sounds_cb, 0, "", NULL }, /* Help */ @@ -2884,9 +2881,9 @@ { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "", GTK_STOCK_HELP }, { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "", NULL }, #if GTK_CHECK_VERSION(2,6,0) - { N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "", GTK_STOCK_ABOUT }, + { N_("/Help/_About"), NULL, pidgin_blist_show_no_param_dialog, (guint)pidgin_dialogs_about, "", GTK_STOCK_ABOUT }, #else - { N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "", NULL }, + { N_("/Help/_About"), NULL, pidgin_blist_show_no_param_dialog, (guint)pidgin_dialogs_about, "", NULL }, #endif };