[network-manager-netbook] Add workarounds for mbo #7304

[Tambet Ingo <tambeti src gnome org>]

commit c0acbd1a3af87a74eb24eda3eae09635ced34c7b
Author: Tambet Ingo <tambet gmail com>
Date:   Thu Dec 10 17:11:34 2009 +0200

    Add workarounds for mbo #7304
    
    When there's a dialog shown, it gets the focus automatically. When it's hidden,
    mutter has no idea what to focus so it has to be dpne manually.

 libnm-gtk/utils.c           |   18 ++++++++++++++++++
 libnm-gtk/utils.h           |    8 ++++++++
 libnm-gtk/wireless-dialog.c |    1 +
 src/main.c                  |    7 +++++++
 src/nmn-item-renderer.c     |    2 ++
 5 files changed, 36 insertions(+), 0 deletions(-)
---
diff --git a/libnm-gtk/utils.c b/libnm-gtk/utils.c
index 80fd194..94ac317 100644
--- a/libnm-gtk/utils.c
+++ b/libnm-gtk/utils.c
@@ -854,3 +854,21 @@ utils_next_available_name (GSList *connections, const char *format)
 	g_slist_free (names);
 	return cname;
 }
+
+static NMDialogDoneCallback dialog_done_callback = NULL;
+static gpointer dialog_done_user_data = NULL;
+
+void
+nm_utils_set_dialog_done_cb (NMDialogDoneCallback callback,
+							 gpointer user_data)
+{
+	dialog_done_callback = callback;
+	dialog_done_user_data = user_data;
+}
+
+void
+nm_utils_dialog_done (void)
+{
+	if (dialog_done_callback)
+		dialog_done_callback (dialog_done_user_data);
+}
diff --git a/libnm-gtk/utils.h b/libnm-gtk/utils.h
index 54a39f7..b47aa5b 100644
--- a/libnm-gtk/utils.h
+++ b/libnm-gtk/utils.h
@@ -53,5 +53,13 @@ gboolean utils_mac_valid (const struct ether_addr *addr);
 
 char *utils_next_available_name (GSList *connections, const char *format);
 
+
+typedef void (*NMDialogDoneCallback) (gpointer user_data);
+
+void nm_utils_set_dialog_done_cb (NMDialogDoneCallback callback,
+				  gpointer user_data);
+
+void nm_utils_dialog_done        (void);
+
 #endif /* UTILS_H */
 
diff --git a/libnm-gtk/wireless-dialog.c b/libnm-gtk/wireless-dialog.c
index 6b0e96f..f6a7912 100644
--- a/libnm-gtk/wireless-dialog.c
+++ b/libnm-gtk/wireless-dialog.c
@@ -1133,6 +1133,7 @@ dialog_response (GtkDialog *dialog,
 
  out:
     g_signal_emit (self, signals[DONE], 0, response);
+    nm_utils_dialog_done ();
 
     /* FIXME: clear security? */
 }
diff --git a/src/main.c b/src/main.c
index 67669b3..a8c00f4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,6 +42,12 @@ panel_client_hide (MplPanelClient *panel_client,
     nmn_applet_hide (NMN_APPLET (user_data));
 }
 
+static void
+dialog_done_cb (gpointer user_data)
+{
+    mpl_panel_client_request_focus (MPL_PANEL_CLIENT (user_data));
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -94,6 +100,7 @@ main (int argc, char *argv[])
 
         g_signal_connect (panel_client, "show-begin", G_CALLBACK (panel_client_show), applet);
         g_signal_connect (panel_client, "show-end", G_CALLBACK (panel_client_hide), applet);
+        nm_utils_set_dialog_done_cb (dialog_done_cb, panel_client);
 
         container = mpl_panel_gtk_get_window (MPL_PANEL_GTK (panel_client));
     }
diff --git a/src/nmn-item-renderer.c b/src/nmn-item-renderer.c
index 828c121..599d737 100644
--- a/src/nmn-item-renderer.c
+++ b/src/nmn-item-renderer.c
@@ -25,6 +25,7 @@
 #include "nm-connection-item.h"
 #include "nm-device-item.h"
 #include "nmn-connection-details.h"
+#include "utils.h"
 
 G_DEFINE_TYPE (NmnItemRenderer, nmn_item_renderer, GTK_TYPE_EVENT_BOX)
 
@@ -294,6 +295,7 @@ remove_button_clicked (GtkButton *button, gpointer user_data)
         nm_list_item_delete (item);
 
     gtk_widget_destroy (GTK_WIDGET (dialog));
+    nm_utils_dialog_done ();
 }
 
 static void