diff options
| -rw-r--r-- | .bzrignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/GNOME_FastUserSwitchApplet.server.in.in | 28 | ||||
| -rw-r--r-- | data/Makefile.am | 6 | ||||
| -rw-r--r-- | debian/changelog | 33 | ||||
| -rw-r--r-- | debian/control | 13 | ||||
| -rw-r--r-- | debian/indicator-applet-sus.install | 2 | ||||
| -rw-r--r-- | debian/indicator-applet.install | 6 | ||||
| -rw-r--r-- | libindicate/indicator.c | 29 | ||||
| -rw-r--r-- | libindicate/indicator.h | 3 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | src-sus/Makefile.am | 16 | ||||
| -rw-r--r-- | src-sus/applet-main.c | 352 | ||||
| -rw-r--r-- | src/applet-main.c | 6 |
15 files changed, 492 insertions, 9 deletions
@@ -99,3 +99,7 @@ docs/reference/tmpl/listener.sgml docs/reference/tmpl/listener.sgml.bak docs/reference/tmpl/server.sgml docs/reference/tmpl/server.sgml.bak +src-sus/indicator-applet-sus +data/GNOME_IndicatorAppletSUS.server +data/GNOME_IndicatorAppletSUS.server.in +src-sus/indicator-applet-no-sus diff --git a/Makefile.am b/Makefile.am index bdd32f4..072e8df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = \ src \ + src-sus \ libindicate \ libindicate-gtk \ libindicator \ diff --git a/configure.ac b/configure.ac index 471512f..58b4739 100644 --- a/configure.ac +++ b/configure.ac @@ -180,6 +180,7 @@ AC_DEFINE_PATH(LIBDIR, "${libdir}", [system configuration dir]) AC_OUTPUT([ Makefile src/Makefile +src-sus/Makefile libindicate/Makefile libindicate/indicate.pc libindicate-gtk/Makefile diff --git a/data/GNOME_FastUserSwitchApplet.server.in.in b/data/GNOME_FastUserSwitchApplet.server.in.in new file mode 100644 index 0000000..388713b --- /dev/null +++ b/data/GNOME_FastUserSwitchApplet.server.in.in @@ -0,0 +1,28 @@ +<oaf_info> + <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe" + location="@LIBEXECDIR@/indicator-applet-sus"> + + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:Bonobo/GenericFactory:1.0"/> + <item value="IDL:Bonobo/Unknown:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/> + <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/> + <oaf_attribute name="bonobo:environment" type="stringv"> + <item value="DBUS_SESSION_BUS_ADDRESS"/> + </oaf_attribute> + </oaf_server> + + <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory" + location="OAFIID:GNOME_FastUserSwitchApplet_Factory"> + + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/> + <item value="IDL:Bonobo/Control:1.0"/> + <item value="IDL:Bonobo/Unknown:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Indicator Applet SUS"/> + <oaf_attribute name="description" type="string" _value="A place to adjust your status, change users or exit your session."/> + <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/> + </oaf_server> +</oaf_info> diff --git a/data/Makefile.am b/data/Makefile.am index a03fadc..0908bb0 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -7,11 +7,12 @@ serverdir = \ $(libdir)/bonobo/servers server_in_files = \ - GNOME_IndicatorApplet.server.in + GNOME_IndicatorApplet.server.in \ + GNOME_FastUserSwitchApplet.server.in server_DATA = \ $(server_in_files:.server.in=.server) -$(server_in_files): $(server_in_files:.server.in=.server.in.in) +%.server.in: %.server.in.in sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@ @INTLTOOL_SERVER_RULE@ @@ -67,6 +68,7 @@ CLEANFILES = \ EXTRA_DIST = \ $(icons_DATA) \ GNOME_IndicatorApplet.server.in.in \ + GNOME_FastUserSwitchApplet.server.in.in \ $(schema_in_files) MAINTAINERCLEANFILES = \ diff --git a/debian/changelog b/debian/changelog index 26c8aee..e1f55bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,36 @@ +indicator-applet (0.2.0~bzr319-0ubuntu5~ppa4) UNRELEASED; urgency=low + + * Merging onto the main packaging branch. + + -- Ted Gould <ted@ubuntu.com> Fri, 07 Aug 2009 19:01:57 +0100 + +indicator-applet (0.2.0~bzr319-0ubuntu5~ppa3) karmic; urgency=low + + * Renaming the second Bonobo server description file to match that + of the FastUserSwitchApplet. + + -- Ted Gould <ted@ubuntu.com> Fri, 07 Aug 2009 18:50:33 +0100 + +indicator-applet (0.2.0~bzr319-0ubuntu5~ppa2) karmic; urgency=low + + * Upstream merge for better naming of the applet. + + -- Ted Gould <ted@ubuntu.com> Fri, 07 Aug 2009 18:40:22 +0100 + +indicator-applet (0.2.0~bzr319-0ubuntu5~ppa1) karmic; urgency=low + + * Updating from upstream with two (count them) two applets + installed in the source. + * debian/control: Adding information on indicator-applet-sus which + is a different applet for the SUS indicator. + * debian/indicator-applet.install: Making it more specific so that + it doesn't grab the directories that now have additional files + created by indicator-applet-sus existing. + * debian/indicator-applet-sus.install: List files that are now + used by the new binary package. + + -- Ted Gould <ted@ubuntu.com> Fri, 07 Aug 2009 18:39:59 +0100 + indicator-applet (0.2.0~bzr319-0ubuntu4) karmic; urgency=low * Add build-dep on gtk-doc-tools diff --git a/debian/control b/debian/control index 4281a15..86c1447 100644 --- a/debian/control +++ b/debian/control @@ -30,6 +30,19 @@ Description: GNOME panel indicator applet Currently this includes support for messaging applications in the indicator-messages package. +Package: indicator-applet-sus +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-panel, + indicator-applet (= ${binary:Version}) +Description: A clone of the GNOME panel indicator applet. + Indicator-applet is an applet to display information from + various applications consistently in the GNOME panel. + . + This instance will only load the SUS indicator which provies + status changing, user choosing and session management. + Package: libindicate2 Section: libs Conflicts: libindicate diff --git a/debian/indicator-applet-sus.install b/debian/indicator-applet-sus.install new file mode 100644 index 0000000..3a016e0 --- /dev/null +++ b/debian/indicator-applet-sus.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/bonobo/servers/GNOME_FastUserSwitchApplet.server +debian/tmp/usr/lib/indicator-applet/indicator-applet-sus diff --git a/debian/indicator-applet.install b/debian/indicator-applet.install index a6e5326..772d432 100644 --- a/debian/indicator-applet.install +++ b/debian/indicator-applet.install @@ -1,4 +1,4 @@ -debian/tmp/etc -debian/tmp/usr/lib/bonobo -debian/tmp/usr/lib/indicator-applet +debian/tmp/usr/lib/bonobo/servers/GNOME_IndicatorApplet.server +debian/tmp/usr/lib/indicator-applet/indicator-applet +debian/tmp/usr/lib/indicator-applet/listen-and-print debian/tmp/usr/share/icons diff --git a/libindicate/indicator.c b/libindicate/indicator.c index cb257eb..18cdc4a 100644 --- a/libindicate/indicator.c +++ b/libindicate/indicator.c @@ -220,16 +220,39 @@ indicate_indicator_new_with_server (IndicateServer * server) IndicateIndicator * indicator = g_object_new(INDICATE_TYPE_INDICATOR, NULL); + indicate_indicator_set_server (indicator, server); + + return indicator; +} + +/** + indicate_indicator_set_server: + @indicator: a #IndicateIndicator to act on + @server: the #IndicateServer which should be associated with @indicator + + Defines which server this indicator must be associated to. Also, adds a + reference to the server. +*/ +void +indicate_indicator_set_server (IndicateIndicator * indicator, IndicateServer * server) +{ IndicateIndicatorPrivate * priv = INDICATE_INDICATOR_GET_PRIVATE(indicator); + + if (server != NULL) { + g_object_ref(server); + } + if (priv->server != NULL) { + indicate_server_remove_indicator (priv->server, indicator); g_object_unref(priv->server); - priv->server = NULL; } priv->server = server; - g_object_ref(priv->server); + if (server != NULL) { + indicate_server_add_indicator (server, indicator); + } - return indicator; + return; } diff --git a/libindicate/indicator.h b/libindicate/indicator.h index 20b998d..b2e33c0 100644 --- a/libindicate/indicator.h +++ b/libindicate/indicator.h @@ -119,6 +119,9 @@ void indicate_indicator_hide (IndicateIndicator * indicator); gboolean indicate_indicator_is_visible (IndicateIndicator * indicator); +/* Define this indicator server */ +void indicate_indicator_set_server (IndicateIndicator * indicator, IndicateServer * server); + /* Every entry has an ID, here's how to get it */ guint indicate_indicator_get_id (IndicateIndicator * indicator); diff --git a/po/POTFILES.in b/po/POTFILES.in index 0426b06..2d4cb1d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,5 @@ [encoding: UTF-8] data/GNOME_IndicatorApplet.server.in.in +data/GNOME_IndicatorAppletSUS.server.in.in data/indicator-applet.schemas.in src/applet-main.c diff --git a/src-sus/Makefile.am b/src-sus/Makefile.am new file mode 100644 index 0000000..4a043ca --- /dev/null +++ b/src-sus/Makefile.am @@ -0,0 +1,16 @@ + +libexec_PROGRAMS = \ + indicator-applet-sus + +indicator_applet_sus_CFLAGS = \ + -DG_LOG_DOMAIN=\""Indicator-Applet"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DINDICATOR_DIR=\""$(libdir)/indicators/2"\" \ + -I$(srcdir)/.. \ + $(APPLET_CFLAGS) + +indicator_applet_sus_SOURCES = \ + applet-main.c + +indicator_applet_sus_LDADD = \ + $(APPLET_LIBS) diff --git a/src-sus/applet-main.c b/src-sus/applet-main.c new file mode 100644 index 0000000..0e43923 --- /dev/null +++ b/src-sus/applet-main.c @@ -0,0 +1,352 @@ +/* +A small wrapper utility to load indicators and put them as menu items +into the gnome-panel using it's applet interface. + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould <ted@canonical.com> + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +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 <panel-applet.h> +#include <libgnomeui/gnome-ui-init.h> + +#include "libindicator/indicator.h" + +#define ICONS_DIR (DATADIR G_DIR_SEPARATOR_S "indicator-applet" G_DIR_SEPARATOR_S "icons") + +static gboolean applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data); + + +static void cw_panel_background_changed (PanelApplet *applet, + PanelAppletBackgroundType type, + GdkColor *colour, + GdkPixmap *pixmap, + GtkWidget *menubar); + +/* ****************** * + * Global Variables * + * ****************** */ + +static GnomeProgram *program = NULL; + + +/************* + * main + * ***********/ + +PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory", + PANEL_TYPE_APPLET, + "indicator-applet-sus", "0", + applet_fill_cb, NULL); + +/************* + * init function + * ***********/ +static gboolean +load_module (const gchar * name, GtkWidget * menu) +{ + g_debug("Looking at Module: %s", name); + g_return_val_if_fail(name != NULL, FALSE); + + if (!g_str_has_suffix(name, G_MODULE_SUFFIX)) { + return FALSE; + } + + g_debug("Loading Module: %s", name); + + gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL); + GModule * module = g_module_open(fullpath, + G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + g_free(fullpath); + g_return_val_if_fail(module != NULL, FALSE); + + get_version_t lget_version = NULL; + g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version)), FALSE); + if (!INDICATOR_VERSION_CHECK(lget_version())) { + g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION); + return FALSE; + } + + get_label_t lget_label = NULL; + g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_label)), FALSE); + g_return_val_if_fail(lget_label != NULL, FALSE); + GtkLabel * label = lget_label(); + + get_icon_t lget_icon = NULL; + g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_ICON_S, (gpointer *)(&lget_icon)), FALSE); + g_return_val_if_fail(lget_icon != NULL, FALSE); + GtkImage * icon = lget_icon(); + + get_menu_t lget_menu = NULL; + g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_MENU_S, (gpointer *)(&lget_menu)), FALSE); + g_return_val_if_fail(lget_menu != NULL, FALSE); + GtkMenu * lmenu = lget_menu(); + + if (label == NULL && icon == NULL) { + /* This is the case where there is nothing to display, + kinda odd that we'd have a module with nothing. */ + g_warning("No label or icon. Odd."); + return FALSE; + } + + GtkWidget * menuitem = gtk_menu_item_new(); + GtkWidget * hbox = gtk_hbox_new(FALSE, 3); + if (icon != NULL) { + gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(icon), FALSE, FALSE, 0); + } + if (label != NULL) { + gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label), FALSE, FALSE, 0); + } + gtk_container_add(GTK_CONTAINER(menuitem), hbox); + gtk_widget_show(hbox); + + if (lmenu != NULL) { + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(lmenu)); + } + + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem); + + return TRUE; +} + +static gboolean +menubar_press (GtkWidget * widget, + GdkEventButton *event, + gpointer data) +{ + if (event->button != 1) { + g_signal_stop_emission_by_name(widget, "button-press-event"); + } + + return FALSE; +} + +static gboolean +menubar_on_expose (GtkWidget * widget, + GdkEventExpose *event, + GtkWidget * menubar) +{ + if (GTK_WIDGET_HAS_FOCUS(menubar)) + gtk_paint_focus(widget->style, widget->window, GTK_WIDGET_STATE(menubar), + NULL, widget, "menubar-applet", 0, 0, -1, -1); + + return FALSE; +} + +static void +about_cb (BonoboUIComponent *ui_container, + gpointer data, + const gchar *cname) +{ + static const gchar *authors[] = { + "Ted Gould <ted@canonical.com>", + NULL + }; + + static gchar *license[] = { + N_("This program is free software: you can redistribute it and/or modify it " + "under the terms of the GNU General Public License version 3, as published " + "by the Free Software Foundation."), + N_("This program is distributed in the hope that it will be useful, but " + "WITHOUT ANY WARRANTY; without even the implied warranties of " + "MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR " + "PURPOSE. See the GNU General Public License for more details."), + N_("You should have received a copy of the GNU General Public License along " + "with this program. If not, see <http://www.gnu.org/licenses/>."), + NULL + }; + gchar *license_i18n; + + license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL); + + gtk_show_about_dialog(NULL, + "version", "0.1", + "copyright", "Copyright \xc2\xa9 2009 Canonical, Ltd.", + "comments", _("An applet to hold all of the system indicators."), + "authors", authors, + "license", license_i18n, + "wrap-license", TRUE, + "translator-credits", _("translator-credits"), + "logo-icon-name", "indicator-applet", + "icon-name", "indicator-applet", + "website", "http://launchpad.net/indicator-applet", + "website-label", _("Indicator Applet Website"), + NULL + ); + + g_free (license_i18n); + + return; +} + +#ifdef N_ +#undef N_ +#endif +#define N_(x) x + +static gboolean +applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data) +{ + static const BonoboUIVerb menu_verbs[] = { + BONOBO_UI_VERB ("IndicatorAppletAbout", about_cb), + BONOBO_UI_VERB_END + }; + static const gchar * menu_xml = + "<popup name=\"button3\">" + "<menuitem name=\"About Item\" verb=\"IndicatorAppletAbout\" _label=\"" N_("_About") "\" pixtype=\"stock\" pixname=\"gtk-about\"/>" + "</popup>"; + + GtkWidget *menubar; + gint i; + gint indicators_loaded = 0; + static gboolean first_time = FALSE; + + if (!first_time) + { + gint argc = 1; + gchar *argv[2] = { "indicator-applet-sus", NULL}; + + first_time = TRUE; + program = gnome_program_init ("indicator-applet-sus", "0.1", + LIBGNOMEUI_MODULE, argc, argv, + GNOME_PROGRAM_STANDARD_PROPERTIES, + NULL); + } + + /* Set panel options */ + gtk_container_set_border_width(GTK_CONTAINER (applet), 0); + panel_applet_set_flags(applet, PANEL_APPLET_EXPAND_MINOR); + panel_applet_setup_menu(applet, menu_xml, menu_verbs, NULL); + atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)), + "indicator-applet-sus"); + + /* 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" + " GtkMenuBar::shadow-type = none\n" + " GtkMenuBar::internal-padding = 0\n" + " GtkWidget::focus-line-width = 0\n" + " GtkWidget::focus-padding = 0\n" + "}\n" + "style \"indicator-applet-menubar-style\"\n" + "{\n" + " GtkMenuBar::shadow-type = none\n" + " GtkMenuBar::internal-padding = 0\n" + " GtkWidget::focus-line-width = 0\n" + " GtkWidget::focus-padding = 0\n" + " GtkMenuItem::horizontal-padding = 0\n" + "}\n" + "style \"indicator-applet-menuitem-style\"\n" + "{\n" + " GtkWidget::focus-line-width = 0\n" + " GtkWidget::focus-padding = 0\n" + " GtkMenuItem::horizontal-padding = 0\n" + "}\n" + "widget \"*.fast-user-switch-applet\" style \"indicator-applet-style\"" + "widget \"*.fast-user-switch-menuitem\" style \"indicator-applet-menuitem-style\"" + "widget \"*.fast-user-switch-menubar\" style \"indicator-applet-menubar-style\""); + //gtk_widget_set_name(GTK_WIDGET (applet), "indicator-applet-menubar"); + gtk_widget_set_name(GTK_WIDGET (applet), "fast-user-switch-applet"); + + /* 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), "fast-user-switch-menubar"); + g_signal_connect(menubar, "button-press-event", G_CALLBACK(menubar_press), NULL); + g_signal_connect_after(menubar, "expose-event", G_CALLBACK(menubar_on_expose), menubar); + gtk_container_set_border_width(GTK_CONTAINER(menubar), 0); + + /* load 'em */ + if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) { + GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL); + + const gchar * name; + while ((name = g_dir_read_name(dir)) != NULL) { + if (g_strcmp0(name, "libstatus-users-session.so")) { + continue; + } + if (load_module(name, menubar)) { + indicators_loaded++; + } + } + g_dir_close (dir); + } + + if (indicators_loaded == 0) { + /* A label to allow for click through */ + GtkWidget * item = gtk_label_new(_("No Indicators")); + gtk_container_add(GTK_CONTAINER(applet), item); + gtk_widget_show(item); + } else { + gtk_container_add(GTK_CONTAINER(applet), menubar); + panel_applet_set_background_widget(applet, menubar); + gtk_widget_show(menubar); + } + + /* Background of applet */ + g_signal_connect(applet, "change-background", + G_CALLBACK(cw_panel_background_changed), menubar); + + gtk_widget_show(GTK_WIDGET(applet)); + + return TRUE; +} + +static void +cw_panel_background_changed (PanelApplet *applet, + PanelAppletBackgroundType type, + GdkColor *colour, + GdkPixmap *pixmap, + GtkWidget *menubar) +{ + GtkRcStyle *rc_style; + GtkStyle *style; + + /* reset style */ + gtk_widget_set_style(GTK_WIDGET (applet), NULL); + gtk_widget_set_style(menubar, NULL); + rc_style = gtk_rc_style_new (); + gtk_widget_modify_style(GTK_WIDGET (applet), rc_style); + gtk_widget_modify_style(menubar, rc_style); + gtk_rc_style_unref(rc_style); + + switch (type) + { + case PANEL_NO_BACKGROUND: + break; + case PANEL_COLOR_BACKGROUND: + gtk_widget_modify_bg(GTK_WIDGET (applet), GTK_STATE_NORMAL, colour); + gtk_widget_modify_bg(menubar, GTK_STATE_NORMAL, colour); + break; + + case PANEL_PIXMAP_BACKGROUND: + style = gtk_style_copy(GTK_WIDGET (applet)->style); + if (style->bg_pixmap[GTK_STATE_NORMAL]) + g_object_unref(style->bg_pixmap[GTK_STATE_NORMAL]); + style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap); + gtk_widget_set_style(GTK_WIDGET (applet), style); + gtk_widget_set_style(GTK_WIDGET (menubar), style); + g_object_unref(style); + break; + } +} + diff --git a/src/applet-main.c b/src/applet-main.c index 5af2763..3827b01 100644 --- a/src/applet-main.c +++ b/src/applet-main.c @@ -288,8 +288,12 @@ applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data) const gchar * name; while ((name = g_dir_read_name(dir)) != NULL) { - if (load_module(name, menubar)) + if (!g_strcmp0(name, "libstatus-users-session.so")) { + continue; + } + if (load_module(name, menubar)) { indicators_loaded++; + } } g_dir_close (dir); } |