[Xfce4-commits] <xfce4-xkb-plugin:4.10_panel_support> Window title to reflect if layout is added/edited

[Igor Slepchin]

Updating branch refs/heads/4.10_panel_support
         to c9f0046632ba3fe04f33f5e915db1d7d6a5b8640 (commit)
       from 7064d0473144a5eac3c8939893e93e1fe16bb77c (commit)

commit c9f0046632ba3fe04f33f5e915db1d7d6a5b8640
Author: Igor Slepchin <igor.slepchin at gmail.com>
Date:   Mon Jun 17 14:37:03 2013 -0400

    Window title to reflect if layout is added/edited
    
    Bug 10180

 panel-plugin/xkb-settings-dialog.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c
index 85216ac..3c86f83 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -64,7 +64,13 @@ enum enumeration
     NUM
 };
 
-static gchar       *xkb_settings_layout_dialog_run     ();
+enum change_layout
+{
+    ADD_LAYOUT,
+    EDIT_LAYOUT
+};
+
+static gchar       *xkb_settings_layout_dialog_run     (enum change_layout action);
 static void         xkb_settings_update_from_ui        (t_xkb *xkb);
 
 /**************************************************************/
@@ -372,7 +378,7 @@ xkb_settings_edit_layout (GtkWidget *widget, t_xkb *xkb)
 
     model = gtk_tree_view_get_model (GTK_TREE_VIEW (xkb->layout_tree_view));
 
-    c = xkb_settings_layout_dialog_run ();
+    c = xkb_settings_layout_dialog_run (EDIT_LAYOUT);
     if (c != NULL)
     {
         GtkTreeSelection *selection;
@@ -402,7 +408,7 @@ static void
 xkb_settings_add_layout (GtkWidget *widget, t_xkb *xkb)
 {
     gchar *c;
-    c = xkb_settings_layout_dialog_run();
+    c = xkb_settings_layout_dialog_run (ADD_LAYOUT);
     if (c != NULL)
     {
         GtkTreeIter iter;
@@ -814,7 +820,7 @@ xkb_settings_add_layout_to_available_layouts_tree (XklConfigRegistry * config_re
 }
 
 static gchar *
-xkb_settings_layout_dialog_run (void)
+xkb_settings_layout_dialog_run (enum change_layout action)
 {
     GtkWidget *dialog;
     GtkTreeStore *treestore;
@@ -827,7 +833,8 @@ xkb_settings_layout_dialog_run (void)
 
     registry = xkb_config_get_xkl_registry ();
 
-    dialog = xfce_titled_dialog_new_with_buttons(_("Add layout"),
+    dialog = xfce_titled_dialog_new_with_buttons (action == ADD_LAYOUT ? _("Add layout") :
+                                                  _("Edit layout"),
                             GTK_WINDOW (settings_dialog),
                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                             GTK_STOCK_CANCEL,