aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog31
-rw-r--r--debian/control2
-rw-r--r--src/applet-main.c5
3 files changed, 34 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 3f08411..6ecbe69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,35 @@
-indicator-applet (0.1~ppa23) intrepid; urgency=low
+indicator-applet (0.1~ppa27) intrepid; urgency=low
* Adding an API function for pixbufs
- -- Ted Gould <ted@ubuntu.com> Thu, 05 Feb 2009 14:42:46 +0100
+ -- Ted Gould <ted@ubuntu.com> Thu, 05 Feb 2009 14:46:44 +0100
+
+indicator-applet (0.1~ppa26) intrepid; urgency=low
+
+ * Removing the icons
+ * Adding in the docs
+ * Printing the icons dir
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 04 Feb 2009 18:58:32 +0100
+
+indicator-applet (0.1~ppa25) intrepid; urgency=low
+
+ * Set the widget name on the applet rather than the menubar, to make sure
+ it's picked up globally.
+
+ -- Neil J. Patel <neil.patel@canonical.com> Wed, 04 Feb 2009 14:53:41 +0100
+
+indicator-applet (0.1~ppa24) intrepid; urgency=low
+
+ * Adding a conflicts and a replaces to get rid of errors.
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 04 Feb 2009 14:14:25 +0100
+
+indicator-applet (0.1~ppa23) intrepid; urgency=low
+
+ * Removing border
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 04 Feb 2009 13:57:23 +0100
indicator-applet (0.1~ppa22) intrepid; urgency=low
diff --git a/debian/control b/debian/control
index 9d04325..7cacf57 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,8 @@ Description: Applet for the GNOME panel providing various indicators for
Package: libindicate0
Section: libs
+Conflicts: libindicate
+Replaces: libindicate
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
diff --git a/src/applet-main.c b/src/applet-main.c
index e1f1f03..b1f1b0e 100644
--- a/src/applet-main.c
+++ b/src/applet-main.c
@@ -87,6 +87,7 @@ applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data)
/* Init some theme/icon stuff */
gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
ICONS_DIR);
+ g_debug("Icons directory: %s", ICONS_DIR);
gtk_rc_parse_string (
"style \"indicator-applet-style\"\n"
"{\n"
@@ -96,11 +97,11 @@ applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data)
" GtkWidget::focus-padding = 0\n"
"}\n"
"widget \"*.indicator-applet-menubar\" style \"indicator-applet-style\"");
-
+ gtk_widget_set_name(GTK_WIDGET (applet), "indicator-applet-menubar");
+
/* Build menubar */
menubar = gtk_menu_bar_new();
GTK_WIDGET_SET_FLAGS (menubar, GTK_WIDGET_FLAGS(menubar) | GTK_CAN_FOCUS);
- gtk_widget_set_name(GTK_WIDGET (menubar), "indicator-applet-menubar");
g_signal_connect_after(menubar, "expose-event", G_CALLBACK(menubar_on_expose), menubar);
gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);