Merge lp:~mitya57/indicator-applet/libpanel-applet-3.22-part1 into lp:indicator-applet

[Dmitry Shachnev]

Port to work with libpanel-applet 3.22.

Port to work with libpanel-applet 3.22

* Convert from out-of-process applet to in-process applet:
  - Do not call methods that change the global state, such as
    g_log_set_default_handler().
  - Refactor src/Makefile.am, reuse some flags for different builds.
  - Drop the D-Bus services files, no longer needed.
* Do not call panel_applet_set_background_widget(), this call is not
  needed with libpanel-applet ≥ 3.16.
* Update the install files according to in-process switch.

While it now builds with both gnome-panel 3.20 and 3.22, the packaging will need a minor update for install files when the actual switch to 3.22 is done (drop 5.0/ from the applets paths).

[Alberts Muktupāvels (muktupavels)]

What about debian/source_indicator-applet.py file?

[Dmitry Shachnev (mitya57)]

OK, pushed a new commit.

[Alberts Muktupāvels (muktupavels)]

review: Approve

[lp:~mitya57/indicator-applet/libpanel-applet-3.22-part1]

435. By Dmitry Shachnev on 2016-11-22

Remove debian/source_indicator-applet.py, now that we have no log files.

Also remove the unused log_to_file() function.

436. By Dmitry Shachnev on 2016-11-22

Add a changelog entry.

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2011-08-02 23:46:44 +0000
+++ data/Makefile.am	2016-11-22 11:01:44 +0000
@@ -14,31 +14,13 @@
 
 %.panel-applet.in: %.panel-applet.in.in Makefile
 	$(AM_V_GEN)sed \
-	    -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+	    -e "s|\@PKGLIBDIR\@|$(pkglibdir)|" \
 	    $< > $@
 
 %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 
 ##############################
-# DBus Services
-##############################
-
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = \
-	org.gnome.panel.applet.IndicatorAppletFactory.service.in \
-	org.gnome.panel.applet.IndicatorAppletCompleteFactory.service.in \
-	org.gnome.panel.applet.IndicatorAppletAppmenuFactory.service.in \
-	org.gnome.panel.applet.FastUserSwitchAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-%.service: %.service.in Makefile
-	$(AM_V_GEN)sed \
-	    -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-	    $< > $@
-
-
-##############################
 # Icons
 ##############################
 
@@ -67,13 +49,11 @@
 CLEANFILES =					\
 	$(applet_in_files)			\
 	$(applet_DATA)				\
-	$(service_DATA)				\
 	*.bak
 
 EXTRA_DIST =					\
 	$(icons_DATA)				\
-	$(applet_in_files:.in=.in.in)		\
-	$(service_in_files)
+	$(applet_in_files:.in=.in.in)
 
 MAINTAINERCLEANFILES =				\
 	Makefile.in

=== modified file 'data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in.in'
--- data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in.in	2010-11-10 18:28:18 +0000
+++ data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in.in	2016-11-22 11:01:44 +0000
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=FastUserSwitchAppletFactory
-Location=@LIBEXECDIR@/indicator-applet-session
+InProcess=true
+Location=@PKGLIBDIR@/libindicator-applet-session.so
 Name=Indicator Applet Factory
 Description=Indicator Applet Factory
 

=== modified file 'data/org.ayatana.panel.IndicatorApplet.panel-applet.in.in'
--- data/org.ayatana.panel.IndicatorApplet.panel-applet.in.in	2010-11-10 18:28:18 +0000
+++ data/org.ayatana.panel.IndicatorApplet.panel-applet.in.in	2016-11-22 11:01:44 +0000
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=IndicatorAppletFactory
-Location=@LIBEXECDIR@/indicator-applet
+InProcess=true
+Location=@PKGLIBDIR@/libindicator-applet.so
 Name=Indicator Applet Factory
 Description=Indicator Applet Factory
 

=== modified file 'data/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in.in'
--- data/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in.in	2010-11-10 18:28:18 +0000
+++ data/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in.in	2016-11-22 11:01:44 +0000
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=IndicatorAppletAppmenuFactory
-Location=@LIBEXECDIR@/indicator-applet-appmenu
+InProcess=true
+Location=@PKGLIBDIR@/libindicator-applet-appmenu.so
 Name=Indicator Applet Appmenu Factory
 Description=Indicator Applet Appmenu Factory
 

=== modified file 'data/org.ayatana.panel.IndicatorAppletComplete.panel-applet.in.in'
--- data/org.ayatana.panel.IndicatorAppletComplete.panel-applet.in.in	2010-11-10 18:28:18 +0000
+++ data/org.ayatana.panel.IndicatorAppletComplete.panel-applet.in.in	2016-11-22 11:01:44 +0000
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=IndicatorAppletCompleteFactory
-Location=@LIBEXECDIR@/indicator-applet-complete
+InProcess=true
+Location=@PKGLIBDIR@/libindicator-applet-complete.so
 Name=Indicator Applet Complete Factory
 Description=Indicator Applet Complete Factory
 

=== removed file 'data/org.gnome.panel.applet.FastUserSwitchAppletFactory.service.in'
--- data/org.gnome.panel.applet.FastUserSwitchAppletFactory.service.in	2010-11-10 18:28:18 +0000
+++ data/org.gnome.panel.applet.FastUserSwitchAppletFactory.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.panel.applet.FastUserSwitchAppletFactory
-Exec=@LIBEXECDIR@/indicator-applet-session

=== removed file 'data/org.gnome.panel.applet.IndicatorAppletAppmenuFactory.service.in'
--- data/org.gnome.panel.applet.IndicatorAppletAppmenuFactory.service.in	2010-11-10 18:28:18 +0000
+++ data/org.gnome.panel.applet.IndicatorAppletAppmenuFactory.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.panel.applet.IndicatorAppletAppmenuFactory
-Exec=@LIBEXECDIR@/indicator-applet-appmenu

=== removed file 'data/org.gnome.panel.applet.IndicatorAppletCompleteFactory.service.in'
--- data/org.gnome.panel.applet.IndicatorAppletCompleteFactory.service.in	2010-11-10 18:28:18 +0000
+++ data/org.gnome.panel.applet.IndicatorAppletCompleteFactory.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.panel.applet.IndicatorAppletCompleteFactory
-Exec=@LIBEXECDIR@/indicator-applet-complete

=== removed file 'data/org.gnome.panel.applet.IndicatorAppletFactory.service.in'
--- data/org.gnome.panel.applet.IndicatorAppletFactory.service.in	2010-11-10 18:28:18 +0000
+++ data/org.gnome.panel.applet.IndicatorAppletFactory.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.panel.applet.IndicatorAppletFactory
-Exec=@LIBEXECDIR@/indicator-applet

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-27 11:45:58 +0000
+++ debian/changelog	2016-11-22 11:01:44 +0000
@@ -1,3 +1,17 @@
+indicator-applet (12.10.2+17.04.20161122.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Convert from out-of-process applet to in-process applet:
+    - Do not call methods that change the global state, such as
+      g_log_set_default_handler().
+    - Refactor src/Makefile.am, reuse some flags for different builds.
+    - Drop the D-Bus services files, no longer needed.
+  * Do not call panel_applet_set_background_widget(), this call is not
+    needed with libpanel-applet ≥ 3.16.
+  * Update the install files according to in-process switch.
+  * Remove the apport hook, not useful without log files.
+
+ -- Dmitry Shachnev <[e-mail]>  Mon, 14 Nov 2016 22:08:00 +0300
+
 indicator-applet (12.10.2+15.04.20141127.2-0ubuntu1) vivid; urgency=low
 
   [ Dmitry Shachnev ]

=== modified file 'debian/indicator-applet-appmenu.install'
--- debian/indicator-applet-appmenu.install	2014-11-27 11:44:24 +0000
+++ debian/indicator-applet-appmenu.install	2016-11-22 11:01:44 +0000
@@ -1,3 +1,2 @@
-debian/tmp/usr/lib/*/indicator-applet-appmenu
-debian/tmp/usr/share/dbus-1/services/org.gnome.panel.applet.IndicatorAppletAppmenuFactory.service
-debian/tmp/usr/share/gnome-panel/5.0/applets/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet
+usr/lib/*/indicator-applet/libindicator-applet-appmenu.so
+usr/share/gnome-panel/5.0/applets/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet

=== modified file 'debian/indicator-applet-complete.install'
--- debian/indicator-applet-complete.install	2014-11-27 11:44:24 +0000
+++ debian/indicator-applet-complete.install	2016-11-22 11:01:44 +0000
@@ -1,3 +1,2 @@
-debian/tmp/usr/lib/*/indicator-applet-complete
-debian/tmp/usr/share/dbus-1/services/org.gnome.panel.applet.IndicatorAppletCompleteFactory.service
-debian/tmp/usr/share/gnome-panel/5.0/applets/org.ayatana.panel.IndicatorAppletComplete.panel-applet
+usr/lib/*/indicator-applet/libindicator-applet-complete.so
+usr/share/gnome-panel/5.0/applets/org.ayatana.panel.IndicatorAppletComplete.panel-applet

=== modified file 'debian/indicator-applet-session.install'
--- debian/indicator-applet-session.install	2014-11-27 11:44:24 +0000
+++ debian/indicator-applet-session.install	2016-11-22 11:01:44 +0000
@@ -1,3 +1,2 @@
-debian/tmp/usr/lib/*/indicator-applet-session
-debian/tmp/usr/share/dbus-1/services/org.gnome.panel.applet.FastUserSwitchAppletFactory.service
-debian/tmp/usr/share/gnome-panel/5.0/applets/org.ayatana.panel.FastUserSwitchApplet.panel-applet
+usr/lib/*/indicator-applet/libindicator-applet-session.so
+usr/share/gnome-panel/5.0/applets/org.ayatana.panel.FastUserSwitchApplet.panel-applet

=== modified file 'debian/indicator-applet.install'
--- debian/indicator-applet.install	2014-11-27 11:44:24 +0000
+++ debian/indicator-applet.install	2016-11-22 11:01:44 +0000
@@ -1,7 +1,5 @@
-debian/tmp/usr/lib/*/indicator-applet
-debian/tmp/usr/share/dbus-1/services/org.gnome.panel.applet.IndicatorAppletFactory.service
-debian/tmp/usr/share/gnome-panel/5.0/applets/org.ayatana.panel.IndicatorApplet.panel-applet
-debian/tmp/usr/share/icons
-debian/tmp/usr/share/locale
-debian/source_indicator-applet.py usr/share/apport/package-hooks
+usr/lib/*/indicator-applet/libindicator-applet.so
+usr/share/gnome-panel/5.0/applets/org.ayatana.panel.IndicatorApplet.panel-applet
+usr/share/icons
+usr/share/locale
 debian/indicator-applet-crashdb.conf /etc/apport/crashdb.conf.d/

=== removed file 'debian/source_indicator-applet.py'
--- debian/source_indicator-applet.py	2012-07-13 09:02:03 +0000
+++ debian/source_indicator-applet.py	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-from __future__ import print_function
-import os.path
-from apport.hookutils import *
-from xdg.BaseDirectory import xdg_cache_home
-
-APPLET_LOG = os.path.join(xdg_cache_home, 'indicator-applet.log')
-APPLET_SESSION_LOG = os.path.join(xdg_cache_home, 'indicator-applet-session.log')
-COMPLETE_LOG = os.path.join(xdg_cache_home, 'indicator-applet-complete.log')
-APPMENU_LOG = os.path.join(xdg_cache_home, 'indicator-applet-appmenu.log')
-
-def add_info(report, ui):
-    if not apport.packaging.is_distro_package(report['Package'].split()[0]):
-        report['ThirdParty'] = 'True'
-        report['CrashDB'] = 'indicator_applet'
-
-    response = ui.choice("How would you describe the issue?", ["None of the indicator menus are working correctly", "The Sound Menu is not working correctly", "The login/logout menu is not working correctly", "The Networking Menu is not working correctly", "The date/time menu is not working correctly", "The application testing menu is not working correctly", "The all-in-one (complete) applet is not working correctly", "Another menu is not working correctly"], False)
-    try:
-        if response == None: # user cancelled
-            raise StopIteration
-        if response[0] == 0: # an issue with indicator-applet
-            report.add_package_info("indicator-applet")
-        if response[0] == 1: # the issue is with indicator-sound
-            report.add_package_info("indicator-sound")
-        if response[0] == 2: # the issue is with indicator-session
-            report.add_package_info("indicator-session")
-        if response[0] == 3: # the issue is with network-manager
-            report.add_package_info("network-manager-applet")
-        if response[0] == 4: # the issue is with indicator-datetime in "unity"
-            report.add_package_info("indicator-datetime")
-        if response[0] == 5: # the issue is with indicator-applet-appmenu
-            report.add_package_info("indicator-applet-appmenu")
-        if response[0] == 6: # the issue is with indicator-applet-complete
-            report.add_package_info("indicator-applet-complete")            
-        if response[0] == 7: # the issue is with indicator-application
-            report.add_package_info("indicator-application")
-    except:
-        print('Unfortunately, that package is not installed. Please refer to https://wiki.ubuntu.com/Bugs/FindRightPackage')
-
-    attach_file_if_exists(report, APPLET_LOG, 'indicator-applet.log')
-    attach_file_if_exists(report, APPLET_SESSION_LOG, 'indicator-applet-session.log')
-    attach_file_if_exists(report, COMPLETE_LOG, 'indicator-applet-complete.log')
-    attach_file_if_exists(report, APPMENU_LOG, 'indicator-applet-appmenu.log')

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2014-02-18 17:30:47 +0000
+++ src/Makefile.am	2016-11-22 11:01:44 +0000
@@ -1,86 +1,47 @@
-
-libexec_PROGRAMS = \
-	indicator-applet \
-	indicator-applet-appmenu \
-	indicator-applet-session \
-	indicator-applet-complete
-
-indicator_applet_CFLAGS = \
+indicator_applet_libdir = ${pkglibdir}
+indicator_applet_lib_LTLIBRARIES = \
+	libindicator-applet.la \
+	libindicator-applet-appmenu.la \
+	libindicator-applet-session.la \
+	libindicator-applet-complete.la
+
+APPLET_SOURCES = \
+	applet-main.c \
+	eggaccelerators.c \
+	eggaccelerators.h \
+	tomboykeybinder.c \
+	tomboykeybinder.h
+
+APPLET_CPPFLAGS = \
+	-DDATADIR=\""$(datadir)"\" \
+	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
+	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
+	-DGDK_DISABLE_DEPRECATED \
+	-I$(srcdir)/..
+
+AM_CFLAGS = $(APPLET_CFLAGS)
+AM_LDFLAGS = -module -avoid-version
+
+libindicator_applet_la_SOURCES = $(APPLET_SOURCES)
+libindicator_applet_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
 	-DG_LOG_DOMAIN=\""Indicator-Applet"\" \
-	-DDATADIR=\""$(datadir)"\" \
-	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
-	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-	-DINDICATOR_APPLET \
-	-DGDK_DISABLE_DEPRECATED \
-	-I$(srcdir)/.. \
-	$(APPLET_CFLAGS)
-
-indicator_applet_SOURCES = \
-	applet-main.c \
-	eggaccelerators.c \
-	eggaccelerators.h \
-	tomboykeybinder.c \
-	tomboykeybinder.h
-
-indicator_applet_LDADD = \
-	$(APPLET_LIBS)
-
-indicator_applet_appmenu_CFLAGS = \
+	-DINDICATOR_APPLET
+libindicator_applet_la_LIBADD = $(APPLET_LIBS)
+
+libindicator_applet_appmenu_la_SOURCES = $(APPLET_SOURCES)
+libindicator_applet_appmenu_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
 	-DG_LOG_DOMAIN=\""Indicator-Applet-Appmenu"\" \
-	-DDATADIR=\""$(datadir)"\" \
-	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
-	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-	-DINDICATOR_APPLET_APPMENU \
-	-DGDK_DISABLE_DEPRECATED \
-	-I$(srcdir)/.. \
-	$(APPLET_CFLAGS)
-
-indicator_applet_appmenu_SOURCES = \
-	applet-main.c \
-	eggaccelerators.c \
-	eggaccelerators.h \
-	tomboykeybinder.c \
-	tomboykeybinder.h
-
-indicator_applet_appmenu_LDADD = \
-	$(APPLET_LIBS)
-
-indicator_applet_session_CFLAGS = \
+	-DINDICATOR_APPLET_APPMENU
+libindicator_applet_appmenu_la_LIBADD = $(APPLET_LIBS)
+
+libindicator_applet_session_la_SOURCES = $(APPLET_SOURCES)
+libindicator_applet_session_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
 	-DG_LOG_DOMAIN=\""Indicator-Applet-Session"\" \
-	-DDATADIR=\""$(datadir)"\" \
-	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
-	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-	-DINDICATOR_APPLET_SESSION \
-	-DGDK_DISABLE_DEPRECATED \
-	-I$(srcdir)/.. \
-	$(APPLET_CFLAGS)
-
-indicator_applet_session_SOURCES = \
-	applet-main.c \
-	eggaccelerators.c \
-	eggaccelerators.h \
-	tomboykeybinder.c \
-	tomboykeybinder.h
-
-indicator_applet_session_LDADD = \
-	$(APPLET_LIBS)
-
-indicator_applet_complete_CFLAGS = \
+	-DINDICATOR_APPLET_SESSION
+libindicator_applet_session_la_LIBADD = $(APPLET_LIBS)
+
+libindicator_applet_complete_la_SOURCES = $(APPLET_SOURCES)
+libindicator_applet_complete_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
 	-DG_LOG_DOMAIN=\""Indicator-Applet-Complete"\" \
-	-DDATADIR=\""$(datadir)"\" \
-	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
-	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-	-DINDICATOR_APPLET_COMPLETE \
-	-DGDK_DISABLE_DEPRECATED \
-	-I$(srcdir)/.. \
-	$(APPLET_CFLAGS)
-
-indicator_applet_complete_SOURCES =	\
-	applet-main.c \
-	eggaccelerators.c \
-	eggaccelerators.h \
-	tomboykeybinder.c \
-	tomboykeybinder.h
-
-indicator_applet_complete_LDADD = \
-	$(APPLET_LIBS)
+	-DINDICATOR_APPLET_COMPLETE
+libindicator_applet_complete_la_LIBADD = $(APPLET_LIBS)

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2014-08-15 09:47:51 +0000
+++ src/applet-main.c	2016-11-22 11:01:44 +0000
@@ -68,22 +68,22 @@
  * ***********/
 
 #ifdef INDICATOR_APPLET
-PANEL_APPLET_OUT_PROCESS_FACTORY ("IndicatorAppletFactory",
+PANEL_APPLET_IN_PROCESS_FACTORY ("IndicatorAppletFactory",
                PANEL_TYPE_APPLET,
                applet_fill_cb, NULL);
 #endif
 #ifdef INDICATOR_APPLET_SESSION
-PANEL_APPLET_OUT_PROCESS_FACTORY ("FastUserSwitchAppletFactory",
+PANEL_APPLET_IN_PROCESS_FACTORY ("FastUserSwitchAppletFactory",
                PANEL_TYPE_APPLET,
                applet_fill_cb, NULL);
 #endif
 #ifdef INDICATOR_APPLET_COMPLETE
-PANEL_APPLET_OUT_PROCESS_FACTORY ("IndicatorAppletCompleteFactory",
+PANEL_APPLET_IN_PROCESS_FACTORY ("IndicatorAppletCompleteFactory",
                PANEL_TYPE_APPLET,
                applet_fill_cb, NULL);
 #endif
 #ifdef INDICATOR_APPLET_APPMENU
-PANEL_APPLET_OUT_PROCESS_FACTORY ("IndicatorAppletAppmenuFactory",
+PANEL_APPLET_IN_PROCESS_FACTORY ("IndicatorAppletAppmenuFactory",
                PANEL_TYPE_APPLET,
                applet_fill_cb, NULL);
 #endif
@@ -844,6 +844,18 @@
   license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL);
 
   gtk_show_about_dialog(NULL,
+#ifdef INDICATOR_APPLET
+    "program-name", _("Indicator Applet"),
+#endif
+#ifdef INDICATOR_APPLET_SESSION
+    "program-name", _("Indicator Applet Session"),
+#endif
+#ifdef INDICATOR_APPLET_COMPLETE
+    "program-name", _("Indicator Applet Complete"),
+#endif
+#ifdef INDICATOR_APPLET_APPMENU
+    "program-name", _("Indicator Applet Application Menu"),
+#endif
     "version", VERSION,
     "copyright", "Copyright \xc2\xa9 2009-2010 Canonical, Ltd.",
 #ifdef INDICATOR_APPLET_SESSION
@@ -941,59 +953,6 @@
 #endif
 #define N_(x) x
 
-static void
-log_to_file (const gchar * domain,
-             GLogLevelFlags level,
-             const gchar * message,
-             gpointer data)
-{
-  if (log_file == NULL) {
-    gchar *path;
-
-    g_mkdir_with_parents(g_get_user_cache_dir(), 0755);
-    path = g_build_filename(g_get_user_cache_dir(), LOG_FILE_NAME, NULL);
-
-    log_file = fopen(path, "w");
-
-    g_free(path);
-  }
-
-  if(log_file) {
-    const gchar *prefix;
-
-    switch(level & G_LOG_LEVEL_MASK) {
-      case G_LOG_LEVEL_ERROR:
-        prefix = "ERROR:";
-        break;
-      case G_LOG_LEVEL_CRITICAL:
-        prefix = "CRITICAL:";
-        break;
-      case G_LOG_LEVEL_WARNING:
-        prefix = "WARNING:";
-        break;
-      case G_LOG_LEVEL_MESSAGE:
-        prefix = "MESSAGE:";
-        break;
-      case G_LOG_LEVEL_INFO:
-        prefix = "INFO:";
-        break;
-      case G_LOG_LEVEL_DEBUG:
-        prefix = "DEBUG:";
-        break;
-      default:
-        prefix = "LOG:";
-        break;
-    }
-
-    fprintf(log_file, "%s %s - %s\n", prefix, domain, message);
-    fflush(log_file);
-  }
-
-  g_log_default_handler(domain, level, message, data);
-
-  return;
-}
-
 static gboolean
 applet_fill_cb (PanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
                 gpointer data G_GNUC_UNUSED)
@@ -1038,20 +997,6 @@
   if (!first_time)
   {
     first_time = TRUE;
-#ifdef INDICATOR_APPLET
-    g_set_application_name(_("Indicator Applet"));
-#endif
-#ifdef INDICATOR_APPLET_SESSION
-    g_set_application_name(_("Indicator Applet Session"));
-#endif
-#ifdef INDICATOR_APPLET_COMPLETE
-    g_set_application_name(_("Indicator Applet Complete"));
-#endif
-#ifdef INDICATOR_APPLET_APPMENU
-    g_set_application_name(_("Indicator Applet Application Menu"));
-#endif
-    
-    g_log_set_default_handler(log_to_file, NULL);
 
     tomboy_keybinder_init();
   }
@@ -1130,7 +1075,6 @@
     gtk_widget_show(item);
   } else {
     gtk_container_add(GTK_CONTAINER(applet), menubar);
-    panel_applet_set_background_widget(applet, menubar);
     gtk_widget_show(menubar);
   }