comparison: plugins/docklet/docklet.c
plugins/docklet/docklet.c
- changeset 4635
- 475ccd9dc3ac
- parent 4606
- 82c33fac5704
- child 4698
- da492b4191c1
equal
deleted
inserted
replaced
| 4634:c4318fc60090 | 4635:475ccd9dc3ac |
|---|---|
| 93 switch (status) { | 93 switch (status) { |
| 94 case offline: | 94 case offline: |
| 95 case offline_connecting: | 95 case offline_connecting: |
| 96 entry = gtk_menu_item_new_with_label(_("Auto-login")); | 96 entry = gtk_menu_item_new_with_label(_("Auto-login")); |
| 97 g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(auto_login), NULL); | 97 g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(auto_login), NULL); |
| 98 gtk_menu_append(GTK_MENU(menu), entry); | 98 gtk_menu_shell_append(GTK_MENU_SHELL(menu), entry); |
| 99 break; | 99 break; |
| 100 default: | 100 default: |
| 101 gaim_new_item_from_stock(menu, _("New Message.."), GTK_STOCK_CONVERT, G_CALLBACK(show_im_dialog), NULL, 0, 0, NULL); | 101 gaim_new_item_from_stock(menu, _("New Message.."), GTK_STOCK_CONVERT, G_CALLBACK(show_im_dialog), NULL, 0, 0, NULL); |
| 102 gaim_new_item_from_stock(menu, _("Join A Chat..."), GTK_STOCK_JUMP_TO, G_CALLBACK(join_chat), NULL, 0, 0, NULL); | 102 gaim_new_item_from_stock(menu, _("Join A Chat..."), GTK_STOCK_JUMP_TO, G_CALLBACK(join_chat), NULL, 0, 0, NULL); |
| 103 break; | 103 break; |
| 120 while (awy) { | 120 while (awy) { |
| 121 a = (struct away_message *)awy->data; | 121 a = (struct away_message *)awy->data; |
| 122 | 122 |
| 123 entry = gtk_menu_item_new_with_label(a->name); | 123 entry = gtk_menu_item_new_with_label(a->name); |
| 124 g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(do_away_message), a); | 124 g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(do_away_message), a); |
| 125 gtk_menu_append(GTK_MENU(docklet_awaymenu), entry); | 125 gtk_menu_shell_append(GTK_MENU_SHELL(docklet_awaymenu), entry); |
| 126 | 126 |
| 127 awy = g_slist_next(awy); | 127 awy = g_slist_next(awy); |
| 128 } | 128 } |
| 129 | 129 |
| 130 if (away_messages) | 130 if (away_messages) |
| 131 gaim_separator(docklet_awaymenu); | 131 gaim_separator(docklet_awaymenu); |
| 132 | 132 |
| 133 entry = gtk_menu_item_new_with_label(_("New...")); | 133 entry = gtk_menu_item_new_with_label(_("New...")); |
| 134 g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(create_away_mess), NULL); | 134 g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(create_away_mess), NULL); |
| 135 gtk_menu_append(GTK_MENU(docklet_awaymenu), entry); | 135 gtk_menu_shell_append(GTK_MENU_SHELL(docklet_awaymenu), entry); |
| 136 | 136 |
| 137 entry = gtk_menu_item_new_with_label(_("Away")); | 137 entry = gtk_menu_item_new_with_label(_("Away")); |
| 138 gtk_menu_item_set_submenu(GTK_MENU_ITEM(entry), docklet_awaymenu); | 138 gtk_menu_item_set_submenu(GTK_MENU_ITEM(entry), docklet_awaymenu); |
| 139 gtk_menu_append(GTK_MENU(menu), entry); | 139 gtk_menu_shell_append(GTK_MENU_SHELL(menu), entry); |
| 140 } break; | 140 } break; |
| 141 case away: | 141 case away: |
| 142 case away_pending: | 142 case away_pending: |
| 143 entry = gtk_menu_item_new_with_label(_("Back")); | 143 entry = gtk_menu_item_new_with_label(_("Back")); |
| 144 g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(do_im_back), NULL); | 144 g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(do_im_back), NULL); |
| 145 gtk_menu_append(GTK_MENU(menu), entry); | 145 gtk_menu_shell_append(GTK_MENU_SHELL(menu), entry); |
| 146 break; | 146 break; |
| 147 } | 147 } |
| 148 | 148 |
| 149 gaim_separator(menu); | 149 gaim_separator(menu); |
| 150 | 150 |
| 151 entry = gtk_check_menu_item_new_with_label(_("Mute Sounds")); | 151 entry = gtk_check_menu_item_new_with_label(_("Mute Sounds")); |
| 152 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(entry), gaim_sound_get_mute()); | 152 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(entry), gaim_sound_get_mute()); |
| 153 g_signal_connect(G_OBJECT(entry), "toggled", G_CALLBACK(docklet_toggle_mute), NULL); | 153 g_signal_connect(G_OBJECT(entry), "toggled", G_CALLBACK(docklet_toggle_mute), NULL); |
| 154 gtk_menu_append(GTK_MENU(menu), entry); | 154 gtk_menu_shell_append(GTK_MENU_SHELL(menu), entry); |
| 155 | 155 |
| 156 gaim_new_item_from_stock(menu, _("File Transfers..."), GTK_STOCK_REVERT_TO_SAVED, G_CALLBACK(show_xfer_dialog), NULL, 0, 0, NULL); | 156 gaim_new_item_from_stock(menu, _("File Transfers..."), GTK_STOCK_REVERT_TO_SAVED, G_CALLBACK(show_xfer_dialog), NULL, 0, 0, NULL); |
| 157 gaim_new_item_from_pixbuf(menu, _("Accounts..."), "accounts-menu.png", G_CALLBACK(account_editor), NULL, 0, 0, NULL); | 157 gaim_new_item_from_pixbuf(menu, _("Accounts..."), "accounts-menu.png", G_CALLBACK(account_editor), NULL, 0, 0, NULL); |
| 158 gaim_new_item_from_stock(menu, _("Preferences..."), GTK_STOCK_PREFERENCES, G_CALLBACK(show_prefs), NULL, 0, 0, NULL); | 158 gaim_new_item_from_stock(menu, _("Preferences..."), GTK_STOCK_PREFERENCES, G_CALLBACK(show_prefs), NULL, 0, 0, NULL); |
| 159 | 159 |
| 164 case offline_connecting: | 164 case offline_connecting: |
| 165 break; | 165 break; |
| 166 default: | 166 default: |
| 167 entry = gtk_menu_item_new_with_label(_("Signoff")); | 167 entry = gtk_menu_item_new_with_label(_("Signoff")); |
| 168 g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(signoff_all), NULL); | 168 g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(signoff_all), NULL); |
| 169 gtk_menu_append(GTK_MENU(menu), entry); | 169 gtk_menu_shell_append(GTK_MENU_SHELL(menu), entry); |
| 170 break; | 170 break; |
| 171 } | 171 } |
| 172 | 172 |
| 173 gaim_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT, G_CALLBACK(do_quit), NULL, 0, 0, 0); | 173 gaim_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT, G_CALLBACK(do_quit), NULL, 0, 0, 0); |
| 174 | 174 |
