From 1788ec9ce2c0d99c6b5d85150d67db76fed02d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Tue, 8 Nov 2011 23:42:40 +0100
Subject: Export the indicator name hint

Using the PACKAGE config.h variable.
---
 src/indicator-messages.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/indicator-messages.c')

diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index 1b96464..d13de56 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -20,6 +20,8 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "config.h"
+
 #include <string.h>
 #include <glib.h>
 #include <glib-object.h>
@@ -93,6 +95,7 @@ static void indicator_messages_middle_click (IndicatorObject * io,
                                              IndicatorObjectEntry * entry,
                                              guint time, gpointer data);
 static const gchar * get_accessible_desc  (IndicatorObject * io);
+static const gchar * get_name_hint        (IndicatorObject * io);
 static void connection_change             (IndicatorServiceManager * sm,
                                            gboolean connected,
                                            gpointer user_data);
@@ -134,6 +137,7 @@ indicator_messages_class_init (IndicatorMessagesClass *klass)
 	io_class->get_image = get_icon;
 	io_class->get_menu = get_menu;
 	io_class->get_accessible_desc = get_accessible_desc;
+	io_class->get_name_hint = get_name_hint;
 	io_class->secondary_activate = indicator_messages_middle_click;
 
 	if (bus_node_info == NULL) {
@@ -796,6 +800,13 @@ get_accessible_desc (IndicatorObject * io)
 	return accessible_desc;
 }
 
+/* Returns the name hint of the indicator */
+static const gchar *
+get_name_hint (IndicatorObject *io)
+{
+  return PACKAGE;
+}
+
 /* Hide the notifications on middle-click over the indicator-messages */
 static void
 indicator_messages_middle_click (IndicatorObject * io, IndicatorObjectEntry * entry,
-- 
cgit v1.2.3


From 6de22d3836fd5e193433c5ed28136c101ddc48e4 Mon Sep 17 00:00:00 2001
From: Allan LeSage <allanlesage@gmail.com>
Date: Mon, 23 Jan 2012 13:58:33 -0600
Subject: Fix for gtk_hbox_new, werror on deprecated.

---
 src/indicator-messages.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/indicator-messages.c')

diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index d13de56..82fcfaf 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -695,7 +695,7 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm
 	gint font_size = RIGHT_LABEL_FONT_SIZE;
 	gtk_widget_style_get(GTK_WIDGET(gmi), "toggle-spacing", &padding, NULL);
 
-	GtkWidget * hbox = gtk_hbox_new(FALSE, padding);
+	GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, padding);
 
 	/* Icon, probably someone's face or avatar on an IM */
 	mi_data->icon = gtk_image_new();
-- 
cgit v1.2.3


From fa3ed93da2ae4c79fed88fb005e8564076e41c8d Mon Sep 17 00:00:00 2001
From: Allan LeSage <allanlesage@gmail.com>
Date: Mon, 23 Jan 2012 15:16:17 -0600
Subject: Added macro to gtk_hbox_new fix per charles' advice (and fixed
 tabination).

---
 src/indicator-messages.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/indicator-messages.c')

diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index 82fcfaf..5a96cb9 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -695,7 +695,11 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm
 	gint font_size = RIGHT_LABEL_FONT_SIZE;
 	gtk_widget_style_get(GTK_WIDGET(gmi), "toggle-spacing", &padding, NULL);
 
+#if GTK_CHECK_VERSION(3, 0, 0)
 	GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, padding);
+#else
+	GtkWidget * hbox = gtk_hbox_new(FALSE, padding);
+#endif
 
 	/* Icon, probably someone's face or avatar on an IM */
 	mi_data->icon = gtk_image_new();
-- 
cgit v1.2.3


From cb9291c80d32b4463dd1dc47d3a912ac4166f06d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 31 Jan 2012 21:25:17 -0600
Subject: Fixing dbusmenu-gtk include paths

---
 src/indicator-messages.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/indicator-messages.c')

diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index 5a96cb9..c75b49c 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -28,13 +28,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#if GTK_CHECK_VERSION(3, 0, 0)
-#include <libdbusmenu-gtk3/menu.h>
-#include <libdbusmenu-gtk3/menuitem.h>
-#else
 #include <libdbusmenu-gtk/menu.h>
 #include <libdbusmenu-gtk/menuitem.h>
-#endif
 
 #include <libindicator/indicator.h>
 #include <libindicator/indicator-object.h>
-- 
cgit v1.2.3