[Xfce4-commits] <parole:master> Remove gtk_stock from source

Sean Davis noreply at xfce.org
Fri Oct 11 11:51:10 CEST 2013


Updating branch refs/heads/master
         to 1b1ca850b7991e93f107286f9f546f5a37657e80 (commit)
       from ddeff8b44c7ef10b242dccd47dc9702a3a8cadd9 (commit)

commit 1b1ca850b7991e93f107286f9f546f5a37657e80
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Aug 25 09:13:44 2013 -0400

    Remove gtk_stock from source

 src/gst/parole-gst.c             |    4 ++--
 src/parole-player.c              |   25 ++++++++++++-------------
 src/plugins/tray/tray-provider.c |    6 +++---
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 72237e6..2552f8b 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1494,7 +1494,7 @@ parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg)
                             NULL );
 #elif defined(__FreeBSD__)
     gtk_dialog_add_button(  GTK_DIALOG(dialog), 
-                            GTK_STOCK_OK,
+                            "gtk-ok",
                             GTK_RESPONSE_ACCEPT);
 #endif
     
@@ -1909,7 +1909,7 @@ parole_gst_check_state_change_timeout (gpointer data)
     if ( gst->priv->state != gst->priv->target )
     {
         gboolean ret_val = xfce_dialog_confirm (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gst))),
-                                                GTK_STOCK_YES,
+                                                "gtk-yes",
                                                 _("Stop"),
                                                 _("The stream is taking too much time to load"), 
                                                 NULL);
diff --git a/src/parole-player.c b/src/parole-player.c
index 3b076c4..7b806e2 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -543,8 +543,8 @@ parole_player_open_iso_image (ParolePlayer *player, ParoleIsoImage image)
     
     chooser = gtk_file_chooser_dialog_new (_("Open ISO image"), GTK_WINDOW (player->priv->window),
                                            GTK_FILE_CHOOSER_ACTION_OPEN,
-                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                           GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+                                           "gtk-cancel", GTK_RESPONSE_CANCEL,
+                                           "document-open", GTK_RESPONSE_OK,
                                            NULL);
                 
     gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), FALSE);
@@ -956,8 +956,8 @@ parole_player_select_custom_subtitle (GtkMenuItem *widget, gpointer data)
     /* Build the FileChooser dialog for subtitle selection. */
     chooser = gtk_file_chooser_dialog_new (_("Select Subtitle File"), NULL,
                                            GTK_FILE_CHOOSER_ACTION_OPEN,
-                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                           GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+                                           "gtk-cancel", GTK_RESPONSE_CANCEL,
+                                           "document-open", GTK_RESPONSE_OK,
                                            NULL);
                 
     gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), FALSE);
@@ -1151,9 +1151,9 @@ parole_player_recent_menu_clear_activated_cb (GtkWidget *widget, ParolePlayer *p
     gtk_message_dialog_format_secondary_text ( GTK_MESSAGE_DIALOG(dlg), 
     _("Are you sure you wish to clear your recent items history?  This cannot be undone."));
     
-    gtk_dialog_add_button (GTK_DIALOG(dlg), GTK_STOCK_CANCEL, 0);
+    gtk_dialog_add_button (GTK_DIALOG(dlg), "gtk-cancel", 0);
     clear_button = gtk_dialog_add_button(GTK_DIALOG(dlg),
-                                         GTK_STOCK_CLEAR,
+                                         "edit-clear",
                                          1);
     gtk_button_set_label( GTK_BUTTON(clear_button), _("Clear Recent Items") );
     
@@ -1280,9 +1280,9 @@ parole_player_set_playpause_button_image (GtkWidget *widget, const gchar *stock_
     GtkWidget *img;
     gchar *icon_name = NULL;
     
-    if (g_strcmp0(stock_id, GTK_STOCK_MEDIA_PLAY) == 0) {
+    if (g_strcmp0(stock_id, "gtk-media-play") == 0) {
         icon_name = g_strdup("media-playback-start-symbolic");
-    } else if (g_strcmp0(stock_id, GTK_STOCK_MEDIA_PAUSE) == 0) {
+    } else if (g_strcmp0(stock_id, "gtk-media-pause") == 0) {
         icon_name = g_strdup("media-playback-pause-symbolic");
     }
     
@@ -1378,7 +1378,7 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
           
     gtk_widget_set_sensitive (player->priv->play_pause, TRUE);
     
-    parole_player_set_playpause_button_image (player->priv->play_pause, GTK_STOCK_MEDIA_PAUSE);
+    parole_player_set_playpause_button_image (player->priv->play_pause, "gtk-media-pause");
     gtk_widget_set_tooltip_text(player->priv->play_pause, _("Pause"));
     
     gtk_widget_set_sensitive (player->priv->range, seekable);
@@ -1433,14 +1433,14 @@ parole_player_paused (ParolePlayer *player)
     
     TRACE ("Player paused");
     
-    pix = parole_icon_load (GTK_STOCK_MEDIA_PAUSE, 16);
+    pix = parole_icon_load ("media-playback-pause-symbolic", 16);
     parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, pix);
     
     gtk_widget_set_sensitive (player->priv->play_pause, TRUE);
     
     if ( player->priv->user_seeking == FALSE)
     {
-        parole_player_set_playpause_button_image (player->priv->play_pause, GTK_STOCK_MEDIA_PLAY);
+        parole_player_set_playpause_button_image (player->priv->play_pause, "gtk-media-play");
         gtk_widget_set_tooltip_text(player->priv->play_pause, _("Play"));
     }
     
@@ -1475,7 +1475,6 @@ parole_player_stopped (ParolePlayer *player)
     gtk_widget_hide(player->priv->audiobox);
     gtk_widget_show(player->priv->logo_image);
     
-    
     get_time_string (dur_text, 0);
     gtk_label_set_text (GTK_LABEL (player->priv->label_duration), dur_text);
 
@@ -1485,7 +1484,7 @@ parole_player_stopped (ParolePlayer *player)
     gtk_widget_set_sensitive (player->priv->seekf, FALSE);
     gtk_widget_set_sensitive (player->priv->seekb, FALSE);
 
-    parole_player_set_playpause_button_image (player->priv->play_pause, GTK_STOCK_MEDIA_PLAY);
+    parole_player_set_playpause_button_image (player->priv->play_pause, "gtk-media-play");
     gtk_widget_set_tooltip_text(player->priv->play_pause, _("Play"));
     
     parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
diff --git a/src/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
index 101229c..59319d3 100644
--- a/src/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -278,7 +278,7 @@ configure_plugin (TrayProvider *tray, GtkWidget *widget)
     dialog = gtk_dialog_new_with_buttons   (_("Tray icon plugin"), 
                                             GTK_WINDOW (widget),
                                             GTK_DIALOG_DESTROY_WITH_PARENT,
-                                            GTK_STOCK_CLOSE,
+                                            "gtk-close",
                                             GTK_RESPONSE_CANCEL,
                                             NULL);
 
@@ -343,11 +343,11 @@ delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
     gtk_button_set_image (GTK_BUTTON (minimize), img);
     
     gtk_dialog_add_button(  GTK_DIALOG(dialog),
-                            GTK_STOCK_CANCEL,
+                            "gtk-cancel",
                             GTK_RESPONSE_CANCEL );
     
     gtk_dialog_add_button(  GTK_DIALOG(dialog),
-                            GTK_STOCK_QUIT,
+                            "gtk-quit",
                             GTK_RESPONSE_CLOSE );
                                     
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);


More information about the Xfce4-commits mailing list