gossip r2811 - in trunk: . src

[rhult svn gnome org]

Author: rhult
Date: Sun May 18 16:05:08 2008
New Revision: 2811
URL: http://svn.gnome.org/viewvc/gossip?rev=2811&view=rev

Log:
2008-05-18  Richard Hult  <richard imendio com>

	* src/gossip-app.c: (app_finalize), (app_setup),
	(app_status_icon_popup_menu_cb), (app_status_icon_create_menu):
	Disable the status icon popup menu on mac.


Modified:
   trunk/ChangeLog
   trunk/src/gossip-app.c

Modified: trunk/src/gossip-app.c
==============================================================================
--- trunk/src/gossip-app.c	(original)
+++ trunk/src/gossip-app.c	Sun May 18 16:05:08 2008
@@ -421,7 +421,9 @@
 		g_hash_table_destroy (priv->reconnects);
 	}
 
-	gtk_widget_destroy (priv->popup_menu);
+	if (priv->popup_menu) {
+		gtk_widget_destroy (priv->popup_menu);
+	}
 
 	g_object_unref (priv->tooltips);
 
@@ -904,7 +906,6 @@
 	/* Setup the contact list */
 	app_setup_contact_list (sw, show_offline_widget);
 
-	/* Sort criterium */
 	/* Set window to be hidden. If doesn't have status icon, show window
 	 * and mask "chat_hide_list".
 	 */
@@ -2039,6 +2040,11 @@
 
 	priv = GET_PRIV (app);
 
+	if (!priv->popup_menu) {
+		/* On Mac, there is no menu (at least for now). */ 
+		return;
+	}
+
 	show = gossip_window_get_is_visible (GTK_WINDOW (priv->window));
 
 	g_signal_handlers_block_by_func (priv->popup_menu_show_list_item,
@@ -2068,6 +2074,11 @@
 	GladeXML      *glade;
 	GtkWidget     *message_item;
 
+#ifdef GDK_WINDOWING_QUARTZ
+	/* Unused for now. */
+	return;
+#endif
+
 	priv = GET_PRIV (app);
 
 	glade = gossip_glade_get_file ("main.glade",