Merge lp:~ballogy/gdesklets/optional-use-gconf-appindicator into lp:gdesklets

[Balló György]

Use gconf and appindicator optionally

This change:

1. Makes it possible to use gdesklets without gconf. If gconf-python present on runtime, then gdekslets try to load proxy setting, otherwise not.

2. Instead of checking the availability of python-appindicator on build time, do it on runtime. In this case if python-appindicator installed later, then it's automatically used, otherwise the status icon shown. This patch is useful for distributions other than Ubuntu, where python-appindicator is not installed by default, but the user may installs it later.

[Bjoern Koch (h.humpel)]

First if all: sorry for the late reply... :/.

Anyway... to me this looks pretty good and (IMHO) we could merge these changes.
But I guess we will first have to discuss this on the ML.

[Ronny Lorenz (raumzeit)]

I dont mind merging those changes into gdesklets. The gconf modification
seems reasonable to me but maybe we should make the optional
appindicator stuff behave differently. With the currently proposed
changes the drawback will be that during compile time one can not decide
to never ever use appindicator at all. It will be loaded and used as
soon as its modules are available during runtime...
I dont know if this is what we intend to do? It would be nice to still
be able to deactivate appindicator by all means.

Just my 2cents

Ronny

On 03/11/2012 11:09 AM, Bjoern Koch wrote:
> First if all: sorry for the late reply... :/.
>
> Anyway... to me this looks pretty good and (IMHO) we could merge these changes.
> But I guess we will first have to discuss this on the ML.

[lp:~ballogy/gdesklets/optional-use-gconf-appindicator]

189. By Balló György on 2012-03-16

Allow disable appindicator

[Balló György (ballogy)]

Now I modified my patch to allow disable appindicator again, but do not fail if appindicator enabled but not installed.

[Balló György (ballogy)]

Any decision?

[sergiomb (sergio-sergiomb)]

Hi, I will apply it on Fedora package . gconf it not used anymore ...

Unmerged revisions

189. By Balló György on 2012-03-16

Allow disable appindicator

188. By Balló György on 2012-03-04

Use gconf and appindicator optionally

=== modified file 'configure.ac'
--- configure.ac	2011-10-19 00:50:48 +0000
+++ configure.ac	2012-03-16 14:41:19 +0000
@@ -73,13 +73,6 @@
 
 if test x$enable_appindicator = xyes ; then
   appindicator_available=True
-  PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],,
-                   AC_MSG_ERROR([appindicator-0.1 is not installed]))
-  PKG_CHECK_MODULES(APP_INDICATOR,
-                    appindicator-0.1 >= $APPINDICATOR_REQUIRED)
-  AC_SUBST(APP_INDICATOR_CFLAGS)
-  AC_SUBST(APP_INDICATOR_LIBS)
-  AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
 else
   appindicator_available=False
 fi

=== modified file 'main/TrayIcon.py'
--- main/TrayIcon.py	2011-10-19 00:50:48 +0000
+++ main/TrayIcon.py	2012-03-16 14:41:19 +0000
@@ -4,7 +4,12 @@
 import gtk
 
 if settings.build_time.appindicator:
-  import appindicator
+    try:
+        import appindicator
+    except ImportError:
+        appindicator = None
+else:
+    appindicator = None
 
 class TrayIcon:
 
@@ -14,8 +19,7 @@
 
         self.__traymenu = gtk.Menu()
 
-        if not settings.build_time.appindicator:
-            # Not Ubuntu
+        if not appindicator:
 #            self.__trayicon = gtk.status_icon_new_from_file(ICON)
 #            self.__trayicon.connect("popup-menu", self.__on_button)
             self.__trayicon = gtk.StatusIcon()
@@ -24,7 +28,6 @@
             self.__trayicon.connect("popup-menu", self.__on_button, self.__traymenu)
             self.__trayicon.set_visible(True)
         else:
-            # Ubuntu
             self.__appindicator = appindicator.Indicator("gDesklets",
                                       "gdesklets",
                                       appindicator.CATEGORY_APPLICATION_STATUS)
@@ -66,7 +69,7 @@
             item.show()
             self.__traymenu.append(item)
 
-        if (not settings.build_time.appindicator):
+        if not appindicator:
             self.__trayicon.set_visible(True)
         else:
             self.__appindicator.set_menu(self.__traymenu)

=== modified file 'shell/plugins/PackageInstaller/Downloader.py'
--- shell/plugins/PackageInstaller/Downloader.py	2007-06-23 18:13:19 +0000
+++ shell/plugins/PackageInstaller/Downloader.py	2012-03-16 14:41:19 +0000
@@ -61,16 +61,22 @@
 
         dest_fd = open(dest, "w")
 
-        import gconf
-        client = gconf.client_get_default()
-        use_proxy = client.get_bool('/system/http_proxy/use_http_proxy')
-        if (use_proxy != 0):
-           host = client.get_string('/system/http_proxy/host')
-           port = client.get_int('/system/http_proxy/port')
-           if (host != ""):
-               http_proxy = "http://" + host + ':' + str(port)
-           else:
-               http_proxy = None
+        try:
+            import gconf
+        except ImportError:
+            gconf = None
+        if gconf:
+            client = gconf.client_get_default()
+            use_proxy = client.get_bool('/system/http_proxy/use_http_proxy')
+            if (use_proxy != 0):
+               host = client.get_string('/system/http_proxy/host')
+               port = client.get_int('/system/http_proxy/port')
+               if (host != ""):
+                   http_proxy = "http://" + host + ':' + str(port)
+               else:
+                   http_proxy = None
+            else:
+                http_proxy = None
         else:
             http_proxy = None