[maemo-commits] [maemo-commits] r9228 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-01-22 15:50:52 +0200 (Mon, 22 Jan 2007)
New Revision: 9228

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c
Log:
2007-01-22  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-home-background-dialog.c: make osso-help related code chunks
	optional based on the presence (or not) of libosso-help.


Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-22 12:06:42 UTC (rev 9227)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-22 13:50:52 UTC (rev 9228)
@@ -1,3 +1,8 @@
+2007-01-22  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-home-background-dialog.c: make osso-help related code chunks
+	optional based on the presence (or not) of libosso-help.
+
 2007-01-19  Johan Bilien  <johan.bilien at nokia.com>
 
 	* src/hd-home-background-dialog.c:

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c	2007-01-22 12:06:42 UTC (rev 9227)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c	2007-01-22 13:50:52 UTC (rev 9228)
@@ -112,8 +112,10 @@
   GtkWidget        *color_button;
   GtkWidget        *img_combo;
   GtkWidget        *mode_combo;
+#ifdef HAVE_LIBOSSOHELP
   osso_context_t   *osso_context;
-
+#endif
+  
   HDHomeBackground *background;
   HDHomeBackground *original_background;
 };
@@ -354,14 +356,18 @@
                           HD_HOME_BACKGROUND_DIALOG (gobject),
                           g_value_get_string (value));
         break;
+
+#ifdef HAVE_LIBOSSOHELP
     case PROP_OSSO_CONTEXT:
         priv->osso_context = g_value_get_pointer (value);
-        /* Add help button */
+
         if (priv->osso_context)
           ossohelp_dialog_help_enable (GTK_DIALOG (gobject),
                                        HH_HELP_SET_BACKGROUND,
                                        priv->osso_context);
         break;
+#endif
+        
     case PROP_BACKGROUND:
         hd_home_background_dialog_set_background (
                            HD_HOME_BACKGROUND_DIALOG (gobject),
@@ -388,9 +394,13 @@
     case PROP_BACKGROUND_DIR:
         g_value_set_string (value, priv->background_dir);
         break;
+
+#ifdef HAVE_LIBOSSOHELP
     case PROP_OSSO_CONTEXT:
         g_value_set_pointer (value, priv->osso_context);
         break;
+#endif
+
     case PROP_BACKGROUND:
         g_value_set_object (value, priv->background);
         break;
@@ -428,7 +438,6 @@
 					  NULL);
 
 #ifdef HAVE_LIBOSSOHELP
-  /* Add help button */
   ossohelp_dialog_help_enable(GTK_DIALOG(dialog), 
 			      HILDON_HOME_SELECT_IMAGE_HELP_TOPIC,
 			      home_get_osso_context ());