[zenity: 18/18] Merge branch 'jjardon/no_deprecated'

[Arx Henrique Pereira da Cruz <arxcruz src gnome org>]

commit a0fa643f1c980e8a70938d977600f935b9c215f6
Merge: ba5ea03 c45daa9
Author: Arx Cruz <acruz redhat com>
Date:   Tue Apr 21 13:51:23 2015 +0200

    Merge branch 'jjardon/no_deprecated'
    
    Conflicts:
        src/msg.c

 src/calendar.c      |    4 -
 src/color.c         |   33 +++------
 src/entry.c         |    4 -
 src/fileselection.c |    4 +-
 src/forms.c         |  102 +++---------------------
 src/msg.c           |   22 ++----
 src/notification.c  |    4 -
 src/password.c      |   26 +++----
 src/progress.c      |    4 -
 src/scale.c         |    4 -
 src/text.c          |    6 +-
 src/tree.c          |   11 +--
 src/util.c          |   65 +++++++---------
 src/util.h          |    8 +-
 src/zenity.ui       |  213 +++++++++++++++++++--------------------------------
 15 files changed, 159 insertions(+), 351 deletions(-)
---
diff --cc src/color.c
index be63068,2a7e039..05898c4
--- a/src/color.c
+++ b/src/color.c
@@@ -46,25 -45,12 +45,20 @@@ void zenity_colorselection (ZenityData 
                      G_CALLBACK (zenity_colorselection_dialog_response),
                      color_data);
  
-   if (data->dialog_title)
-     gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
- 
-   colorsel = gtk_color_selection_dialog_get_color_selection (GTK_COLOR_SELECTION_DIALOG (dialog));
- 
    if (color_data->color) {
-     if (gdk_color_parse (color_data->color, &color))
-       gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (colorsel),
-                                              &color);
+     if (gdk_rgba_parse (&color, color_data->color)) {
+       gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+     }
    }
  
 +  if (data->extra_label) {
 +    gint i=0;
 +    while(data->extra_label[i]!=NULL){
 +      gtk_dialog_add_button (GTK_DIALOG (dialog), data->extra_label[i], i);
 +      i++;
 +    }
 +  }
 +
    if (data->ok_label) {
      g_object_get (G_OBJECT (dialog), "ok-button", &button, NULL);
      gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
diff --cc src/msg.c
index 6f07750,6892e73..ddaab26
--- a/src/msg.c
+++ b/src/msg.c
@@@ -31,12 -31,10 +31,12 @@@ static void zenity_text_size_allocate (
  static void
  zenity_msg_construct_question_dialog (GtkWidget *dialog, ZenityMsgData *msg_data, ZenityData *data)
  {
 +
 +
    GtkWidget *cancel_button, *ok_button;
- 
-   cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_NO, GTK_RESPONSE_CANCEL);
-   ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_YES, GTK_RESPONSE_OK);
+   
+   cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_No"), GTK_RESPONSE_CANCEL);
+   ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Yes"), GTK_RESPONSE_OK);
  
    gtk_widget_grab_focus (msg_data->default_cancel ? cancel_button : ok_button);
  
@@@ -48,36 -44,7 +46,34 @@@
  
    if (data->ok_label) {
      gtk_button_set_label (GTK_BUTTON (ok_button), data->ok_label);
-     gtk_button_set_image (GTK_BUTTON (ok_button), 
-                           gtk_image_new_from_stock (GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON));
    }
 +  
 +
 +}
 +
 +static void
 +zenity_label_widget_clipboard_selection(GtkWidget *widget)
 +{
 +  /* Workaround hotfix for suspected toolkit issue:
 +     since focus change of the dialog's focussed widget (text)
 +     somehow currently chooses to destroy
 +     a pre-existing (read: foreign, user-initiated) X11 primary selection
 +     (via gtk_label_select_region() -> ...
 +     -> gtk_clipboard_set_contents()/gtk_clipboard_clear()),
 +     we need to ensure
 +     that the widget does have its gtk-label-select-on-focus property off,
 +     in order to avoid having the label become selected automatically
 +     and thereby having pre-existing clipboard content nullified.
 +     Side note: this selection issue only applies to widgets
 +     which have both
 +                  <property name="can_focus">True</property>
 +                  <property name="selectable">True</property>
 +     .
 +   */
 +  g_object_set(gtk_widget_get_settings (widget),
 +               "gtk-label-select-on-focus",
 +               FALSE,
 +               NULL);
  }
  
  void 
@@@ -172,12 -128,8 +166,12 @@@ zenity_msg (ZenityData *data, ZenityMsg
        zenity_msg_construct_question_dialog (dialog, msg_data, data);
        break;
        
 +    case ZENITY_MSG_SWITCH:
-       zenity_util_set_window_icon_from_stock (dialog, data->window_icon, GTK_STOCK_DIALOG_QUESTION);
++      zenity_util_set_window_icon_from_icon_name (dialog, data->window_icon, "dialog-question");
 +      break;
 +      
      case ZENITY_MSG_ERROR:
-       zenity_util_set_window_icon_from_stock (dialog, data->window_icon, GTK_STOCK_DIALOG_ERROR);
+       zenity_util_set_window_icon_from_icon_name (dialog, data->window_icon, "dialog-error");
        break;
        
      case ZENITY_MSG_INFO:
diff --cc src/password.c
index 2335746,c516100..1d17d91
--- a/src/password.c
+++ b/src/password.c
@@@ -44,26 -43,18 +43,26 @@@ void zenity_password_dialog (ZenityDat
  
    dialog = gtk_dialog_new ();
  
 +  if (data->extra_label) {
 +    gint i=0;
 +    while(data->extra_label[i]!=NULL){
 +      gtk_dialog_add_button (GTK_DIALOG (dialog), data->extra_label[i], i);
 +      i++;
 +    }
 +  }
 +
    gtk_dialog_add_button(GTK_DIALOG(dialog), 
-                         data->cancel_label != NULL ? data->cancel_label : GTK_STOCK_CANCEL, 
+                         data->cancel_label != NULL ? data->cancel_label : _("_Cancel"),
                          GTK_RESPONSE_CANCEL);
    gtk_dialog_add_button(GTK_DIALOG(dialog), 
-                         data->ok_label != NULL ? data->ok_label : GTK_STOCK_OK, 
+                         data->ok_label != NULL ? data->ok_label : _("_OK"),
                          GTK_RESPONSE_OK);
    
-   image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION,
-                                    GTK_ICON_SIZE_DIALOG); 
+   image = gtk_image_new_from_icon_name("dialog-password",
+                                        GTK_ICON_SIZE_DIALOG);
    gtk_dialog_set_default_response(GTK_DIALOG(dialog), 
                                    GTK_RESPONSE_OK);
-   hbox = gtk_hbox_new(FALSE, 5);
+   hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
    gtk_box_pack_start(GTK_BOX(hbox),
                       image,
                       FALSE,
diff --cc src/text.c
index f9daa73,634be3d..581b366
--- a/src/text.c
+++ b/src/text.c
@@@ -276,18 -276,8 +276,16 @@@ zenity_text (ZenityData *data, ZenityTe
    if (text_data->editable)
      zen_text_data->buffer = text_buffer;
  
 +  if (data->extra_label) {
 +    gint i=0;
 +    while(data->extra_label[i]!=NULL){
 +      gtk_dialog_add_button (GTK_DIALOG (dialog), data->extra_label[i], i);
 +      i++;
 +    }
 +  }
 +
    if (data->ok_label) { 
      gtk_button_set_label (GTK_BUTTON (ok_button), data->ok_label);
-     gtk_button_set_image (GTK_BUTTON (ok_button),
-                           gtk_image_new_from_stock (GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON));
    }
  
    if (data->cancel_label) {