This is an automated email from the git hooks/post-receive script. ochosi pushed a commit to branch master in repository panel-plugins/xfce4-clipman-plugin.
commit 4b979fd961f4684f40fdcc97536e2278c279e6b8 Author: Simon Steinbeiss <[email protected]> Date: Thu May 12 00:29:00 2016 +0200 Drop GtkStock and wrap GtkImageMenuItems in IGNORE_DEPRECATIONS --- panel-plugin/main-panel-plugin.c | 2 +- panel-plugin/main-status-icon.c | 2 +- panel-plugin/menu.c | 17 +++++++++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/panel-plugin/main-panel-plugin.c b/panel-plugin/main-panel-plugin.c index e9245a9..341211e 100644 --- a/panel-plugin/main-panel-plugin.c +++ b/panel-plugin/main-panel-plugin.c @@ -80,7 +80,7 @@ panel_plugin_register (XfcePanelPlugin *panel_plugin) } else { - plugin->image = xfce_panel_image_new_from_source (GTK_STOCK_PASTE); + plugin->image = xfce_panel_image_new_from_source ("edit-paste"); } gtk_container_add (GTK_CONTAINER (plugin->button), plugin->image); gtk_container_add (GTK_CONTAINER (panel_plugin), plugin->button); diff --git a/panel-plugin/main-status-icon.c b/panel-plugin/main-status-icon.c index 7573713..218b8db 100644 --- a/panel-plugin/main-status-icon.c +++ b/panel-plugin/main-status-icon.c @@ -90,7 +90,7 @@ status_icon_register (void) } else { - plugin->status_icon = gtk_status_icon_new_from_stock (GTK_STOCK_PASTE); + plugin->status_icon = gtk_status_icon_new_from_icon_name ("edit-paste"); } //gtk_status_icon_set_tooltip (plugin->status_icon, _("Clipman")); g_timeout_add_seconds (60, (GSourceFunc)cb_status_icon_is_embedded, plugin->status_icon); diff --git a/panel-plugin/menu.c b/panel-plugin/menu.c index f8313c1..b203751 100644 --- a/panel-plugin/menu.c +++ b/panel-plugin/menu.c @@ -305,13 +305,17 @@ _clipman_menu_update_list (ClipmanMenu *menu) switch (item->type) { case CLIPMAN_HISTORY_TYPE_TEXT: +G_GNUC_BEGIN_IGNORE_DEPRECATIONS mi = gtk_image_menu_item_new_with_label (item->preview.text); +G_GNUC_END_IGNORE_DEPRECATIONS break; case CLIPMAN_HISTORY_TYPE_IMAGE: +G_GNUC_BEGIN_IGNORE_DEPRECATIONS mi = gtk_image_menu_item_new (); image = gtk_image_new_from_pixbuf (item->preview.image); gtk_container_add (GTK_CONTAINER (mi), image); +G_GNUC_END_IGNORE_DEPRECATIONS break; default: @@ -323,8 +327,10 @@ _clipman_menu_update_list (ClipmanMenu *menu) if (item == item_to_restore) { - image = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name ("go-next-symbolic", GTK_ICON_SIZE_MENU); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image); +G_GNUC_END_IGNORE_DEPRECATIONS } menu->priv->list = g_slist_prepend (menu->priv->list, mi); @@ -343,7 +349,9 @@ _clipman_menu_update_list (ClipmanMenu *menu) if ((pixbuf = clipman_menu_qrcode (item_to_restore->content.text)) != NULL) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS mi = gtk_image_menu_item_new (); +G_GNUC_END_IGNORE_DEPRECATIONS gtk_container_add (GTK_CONTAINER (mi), gtk_image_new_from_pixbuf (pixbuf)); g_signal_connect (mi, "activate", G_CALLBACK (cb_set_qrcode), pixbuf); menu->priv->list = g_slist_prepend (menu->priv->list, mi); @@ -451,6 +459,7 @@ static void clipman_menu_init (ClipmanMenu *menu) { GtkWidget *mi; + GtkWidget *image; menu->priv = GET_PRIVATE (menu); @@ -464,7 +473,11 @@ clipman_menu_init (ClipmanMenu *menu) mi = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); - menu->priv->mi_clear_history = mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLEAR, NULL); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + menu->priv->mi_clear_history = mi = gtk_image_menu_item_new_with_mnemonic (_("_Clear history")); + image = gtk_image_new_from_icon_name ("edit-clear-symbolic", GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu->priv->mi_clear_history), image); +G_GNUC_END_IGNORE_DEPRECATIONS gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); g_signal_connect_swapped (mi, "activate", G_CALLBACK (cb_clear_history), menu); -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
