diff options
Diffstat (limited to 'remmina/src/remmina_icon.c')
| -rw-r--r-- | remmina/src/remmina_icon.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/remmina/src/remmina_icon.c b/remmina/src/remmina_icon.c index c8ebf0ea8..f3a03ea8a 100644 --- a/remmina/src/remmina_icon.c +++ b/remmina/src/remmina_icon.c @@ -124,17 +124,33 @@ static void remmina_icon_populate_additional_menu_item(GtkWidget *menu) { GtkWidget *menuitem; +#if GTK_VERSION == 3 menuitem = gtk_menu_item_new_with_label(_("Open Main Window")); +#else + menuitem = gtk_image_menu_item_new_with_label(_("Open Main Window")); +#endif gtk_widget_show(menuitem); +#if GTK_VERSION == 2 + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), + gtk_image_new_from_icon_name("remmina", GTK_ICON_SIZE_MENU)); +#endif gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_icon_main), NULL); +#if GTK_VERSION == 2 + menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL); +#else menuitem = gtk_menu_item_new_with_mnemonic(_("_Preferences")); +#endif gtk_widget_show(menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_icon_preferences), NULL); +#if GTK_VERSION == 2 + menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL); +#else menuitem = gtk_menu_item_new_with_mnemonic(_("_About")); +#endif gtk_widget_show(menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_icon_about), NULL); @@ -158,7 +174,11 @@ static void remmina_icon_populate_additional_menu_item(GtkWidget *menu) gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); #endif +#if GTK_VERSION == 2 + menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL); +#else menuitem = gtk_menu_item_new_with_mnemonic(_("_Quit")); +#endif gtk_widget_show(menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_icon_destroy), NULL); @@ -242,7 +262,9 @@ static void remmina_icon_populate_extra_menu_item(GtkWidget *menu) gboolean new_ontop; GHashTableIter iter; gchar *tmp; +#ifdef ENABLE_MINIMIZE_TO_TRAY gint n; +#endif new_ontop = remmina_pref.applet_new_ontop; |