Merge lp:~charlesk/indicator-datetime/lp-947315 into lp:indicator-datetime/0.4

[Charles Kerr]

[Charles Kerr (charlesk)]

I know this is a low priority ticket, but this looks like a very easy fix...

[Lars Karlitski (larsu)]

Great catch with setting the dialog hint.

review: Approve

=== modified file 'src/datetime-prefs.c'
--- src/datetime-prefs.c	2012-03-28 06:14:07 +0000
+++ src/datetime-prefs.c	2012-03-30 00:40:24 +0000
@@ -577,21 +577,14 @@
 }
 
 static void
-hide_locations (IndicatorDatetimePanel * self)
-{
-  if (self->priv->loc_dlg != NULL)
-    gtk_widget_destroy (self->priv->loc_dlg);
-}
-
-static void
 show_locations (IndicatorDatetimePanel * self)
 {
   if (self->priv->loc_dlg == NULL) {
     self->priv->loc_dlg = datetime_setup_locations_dialog (self->priv->tzmap);
     GtkWidget * dlg = gtk_widget_get_toplevel (GTK_WIDGET (self));
+    gtk_window_set_type_hint (GTK_WINDOW(self->priv->loc_dlg), GDK_WINDOW_TYPE_HINT_DIALOG);
     gtk_window_set_transient_for (GTK_WINDOW (self->priv->loc_dlg), GTK_WINDOW (dlg));
     g_signal_connect (self->priv->loc_dlg, "destroy", G_CALLBACK (gtk_widget_destroyed), &self->priv->loc_dlg);
-    g_signal_connect_swapped (dlg, "focus-in-event", G_CALLBACK (hide_locations), self);
     gtk_widget_show_all (self->priv->loc_dlg);
   }
   else {