[maemo-commits] [maemo-commits] r9243 - projects/haf/branches/maemo-af-desktop/hildon-desktop/src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-01-23 10:59:31 +0200 (Tue, 23 Jan 2007)
New Revision: 9243

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c
Log:
Fix some merging problem.


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 18:33:03 UTC (rev 9242)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c	2007-01-23 08:59:31 UTC (rev 9243)
@@ -472,16 +472,10 @@
 					  NULL);
 
 #ifdef HAVE_LIBOSSOHELP
-<<<<<<< .mine
   if (priv->osso_context)
     ossohelp_dialog_help_enable (GTK_DIALOG(fdialog), 
                                  HH_HELP_SELECT_IMAGE,
                                  priv->osso_context);
-=======
-  ossohelp_dialog_help_enable(GTK_DIALOG(dialog), 
-			      HILDON_HOME_SELECT_IMAGE_HELP_TOPIC,
-			      home_get_osso_context ());
->>>>>>> .r9232
 #endif
         
   mime_type_filter = gtk_file_filter_new();