comparison: pidgin/pidginapplication.c
pidgin/pidginapplication.c
- changeset 41315
- 1c9f47bbc031
- parent 41314
- 0dc72eacd8bf
- child 41320
- 1695e758b590
equal
deleted
inserted
replaced
| 41314:0dc72eacd8bf | 41315:1c9f47bbc031 |
|---|---|
| 41 #include "gtkprivacy.h" | 41 #include "gtkprivacy.h" |
| 42 #include "gtkroomlist.h" | 42 #include "gtkroomlist.h" |
| 43 #include "gtkxfer.h" | 43 #include "gtkxfer.h" |
| 44 #include "pidginabout.h" | 44 #include "pidginabout.h" |
| 45 #include "pidginaccountmanager.h" | 45 #include "pidginaccountmanager.h" |
| 46 #include "pidginaccountsdisabledmenu.h" | |
| 47 #include "pidginaccountsenabledmenu.h" | 46 #include "pidginaccountsenabledmenu.h" |
| 48 #include "pidginconversationwindow.h" | 47 #include "pidginconversationwindow.h" |
| 49 #include "pidgincore.h" | 48 #include "pidgincore.h" |
| 50 #include "pidgindebug.h" | 49 #include "pidgindebug.h" |
| 50 #include "pidgininactiveaccountsmenu.h" | |
| 51 #include "pidginmooddialog.h" | 51 #include "pidginmooddialog.h" |
| 52 #include "pidgin/pidginpluginsdialog.h" | 52 #include "pidgin/pidginpluginsdialog.h" |
| 53 #include "pidgin/pidginstatusmanager.h" | 53 #include "pidgin/pidginstatusmanager.h" |
| 54 #include "pidginprefs.h" | 54 #include "pidginprefs.h" |
| 55 | 55 |
| 129 } | 129 } |
| 130 | 130 |
| 131 static void | 131 static void |
| 132 pidgin_application_populate_dynamic_menus(PidginApplication *application) { | 132 pidgin_application_populate_dynamic_menus(PidginApplication *application) { |
| 133 GMenu *source = NULL, *target = NULL; | 133 GMenu *source = NULL, *target = NULL; |
| 134 | 134 GMenuModel *model = NULL; |
| 135 /* Link the AccountsDisabledMenu into its proper location. */ | 135 |
| 136 source = pidgin_accounts_disabled_menu_new(); | 136 /* Link the InactiveAccountsMenu into its proper location. */ |
| 137 model = pidgin_inactive_accounts_menu_new(); | |
| 137 target = gtk_application_get_menu_by_id(GTK_APPLICATION(application), | 138 target = gtk_application_get_menu_by_id(GTK_APPLICATION(application), |
| 138 "disabled-accounts"); | 139 "inactive-accounts"); |
| 139 g_menu_append_section(target, NULL, G_MENU_MODEL(source)); | 140 g_menu_append_section(target, NULL, model); |
| 140 | 141 |
| 141 /* Link the AccountsEnabledMenu into its proper location. */ | 142 /* Link the AccountsEnabledMenu into its proper location. */ |
| 142 source = pidgin_accounts_enabled_menu_new(); | 143 source = pidgin_accounts_enabled_menu_new(); |
| 143 target = gtk_application_get_menu_by_id(GTK_APPLICATION(application), | 144 target = gtk_application_get_menu_by_id(GTK_APPLICATION(application), |
| 144 "enabled-accounts"); | 145 "enabled-accounts"); |
