[Xfce4-commits] <xfdesktop:xfce-4.6> Fix some compilation problems.

[Nick Schermer]

Updating branch refs/heads/xfce-4.6
         to 8f79a17cfe62295b8e91a0e17926f27237a77ef2 (commit)
       from 709405e5f92ff503c0e26af82cdc0aaf5b46c0e2 (commit)

commit 8f79a17cfe62295b8e91a0e17926f27237a77ef2
Author: Nick Schermer <nick at xfce.org>
Date:   Wed May 19 20:42:02 2010 +0200

    Fix some compilation problems.
    
    Drop some exo functions if not compiling against exo. Also
    exclude a file from the translations (does not contain any
    strings).

 po/POTFILES.skip                       |    1 +
 src/xfdesktop-file-icon-manager.c      |    2 +-
 src/xfdesktop-file-properties-dialog.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 142e14b..4284efb 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,3 +2,4 @@
 # but shouldn't be included to POT file.
 
 src/xfdesktop-clipboard-manager.c
+src/xfdesktop-icon-view.c
diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
index a838b55..cb96fb1 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -1568,7 +1568,7 @@ xfdesktop_file_icon_menu_fill_template_menu(GtkWidget *menu,
         {
           /* allocate a new submenu for the directory */
           submenu = gtk_menu_new ();
-          exo_gtk_object_ref_sink (GTK_OBJECT (submenu));
+          g_object_ref_sink (GTK_OBJECT (submenu));
           gtk_menu_set_screen (GTK_MENU (submenu), gtk_widget_get_screen (menu));
 
           /* fill the submenu from the folder contents */
diff --git a/src/xfdesktop-file-properties-dialog.c b/src/xfdesktop-file-properties-dialog.c
index ac78962..206ff0b 100644
--- a/src/xfdesktop-file-properties-dialog.c
+++ b/src/xfdesktop-file-properties-dialog.c
@@ -244,7 +244,7 @@ xfdesktop_file_properties_dialog_show(GtkWindow *parent,
             display_name = g_filename_display_name(link_name);
             lbl = gtk_label_new(display_name);
             g_object_set(G_OBJECT(lbl),
-                         "ellipsize", EXO_PANGO_ELLIPSIZE_START,
+                         "ellipsize", PANGO_ELLIPSIZE_START,
                          NULL);
             g_free(display_name);
             g_free(link_name);