rpms/twitux/F-10 twitux-0.65-popup_menu.patch, NONE, 1.1 twitux.spec, 1.6, 1.7

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/twitux/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15722

Modified Files:
	twitux.spec 
Added Files:
	twitux-0.65-popup_menu.patch 
Log Message:
* Fri Dec  5 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.65-1
- Add patch to fix notification area popup menu.
- Update to 0.65.


twitux-0.65-popup_menu.patch:

--- NEW FILE twitux-0.65-popup_menu.patch ---
diff -urp twitux-0.65.OLD/src/twitux-app.c twitux-0.65/src/twitux-app.c
--- twitux-0.65.OLD/src/twitux-app.c	2008-11-03 18:40:17.000000000 -0500
+++ twitux-0.65/src/twitux-app.c	2008-12-04 23:58:53.000000000 -0500
@@ -1013,26 +1013,47 @@ app_status_icon_popup_menu_cb (GtkStatus
 static void
 app_status_icon_create_menu (void)
 {
-	TwituxAppPriv *priv;
-	GtkBuilder    *ui;
+	TwituxAppPriv   *priv;
+	GtkAction       *new_msg;
+	GtkAction       *quit;
+	GtkWidget       *w;
 
 	priv = GET_PRIV (app);
 
-	/* Get widgets */
-	ui =
-		twitux_xml_get_file ("tray_menu.xml",
-							 "tray_menu", &priv->popup_menu,
-							 "tray_show_app", &priv->popup_menu_show_app,
-							 NULL);
+	priv->popup_menu_show_app = gtk_toggle_action_new ("tray_show_app",
+													   _("_Show Twitux"),
+													   NULL,
+													   NULL);
+	g_signal_connect (G_OBJECT (priv->popup_menu_show_app),
+					  "toggled", G_CALLBACK (app_show_hide_cb),
+					  app);
 
-	/* Connect the signals */
-	twitux_xml_connect (ui, app,
-						"tray_new_message", "activate", app_new_message_cb,
-						"tray_quit", "activate", app_quit_cb,
-						"tray_show_app", "toggled", app_show_hide_cb,
-						NULL);
+	new_msg = gtk_action_new ("tray_new_message",
+							  _("_New Message"),
+							  NULL,
+							  "gtk-new");
+	g_signal_connect (G_OBJECT (new_msg),
+					  "activate", G_CALLBACK (app_new_message_cb),
+					  app);
+
+	quit = gtk_action_new ("tray_quit",
+						   _("_Quit"),
+						   NULL,
+						   "gtk-quit");
+	g_signal_connect (G_OBJECT (quit),
+					  "activate", G_CALLBACK (app_quit_cb),
+					  app);
 
-	g_object_unref (ui);
+	priv->popup_menu = gtk_menu_new ();
+	w = gtk_action_create_menu_item (GTK_ACTION (priv->popup_menu_show_app));
+	gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), w);
+	w = gtk_separator_menu_item_new ();
+	gtk_widget_show (w);
+	gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), w);
+	w = gtk_action_create_menu_item (new_msg);
+	gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), w);
+	w = gtk_action_create_menu_item (quit);
+	gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), w);
 }
 
 static void


Index: twitux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/twitux/F-10/twitux.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- twitux.spec	30 Apr 2008 04:00:37 -0000	1.6
+++ twitux.spec	5 Dec 2008 05:21:03 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           twitux
-Version:        0.62
+Version:        0.65
 Release:        1%{?dist}
 Summary:        Twitux is a Twitter client for the Gnome desktop
 
@@ -7,6 +7,7 @@
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/twitux/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-0.65-popup_menu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnome-keyring-devel
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .menu
 
 
 %build
@@ -102,6 +104,10 @@
 
 
 %changelog
+* Fri Dec  5 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.65-1
+- Add patch to fix notification area popup menu.
+- Update to 0.65.
+
 * Tue Apr 29 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.62-1
 - Update to 0.62.