[gnome-disk-utility] Port from SexyUrlLabel to GtkLabel



commit ae36dd620996289fb1b6147259385efb543af783
Author: David Zeuthen <davidz redhat com>
Date:   Fri Jun 19 13:11:16 2009 -0400

    Port from SexyUrlLabel to GtkLabel

 configure.ac               |    2 --
 src/palimpsest/Makefile.am |    2 --
 src/palimpsest/gdu-shell.c |   27 +++++----------------------
 3 files changed, 5 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 361373c..878918c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,6 @@ GIO2_REQUIRED=2.16
 DBUS_GLIB_REQUIRED=0.74
 GNOME_KEYRING_REQUIRED=2.22
 GTK2_REQUIRED=2.17.2
-LIBSEXY_REQUIRED=0.1.11
 UNIQUE_REQUIRED=1.0
 LIBNOTIFY_REQUIRED=0.3.0
 NAUTILUS_REQUIRED=2.24.0
@@ -140,7 +139,6 @@ PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= $GLIB2_REQUIRED)
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED)
 PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= $GTK2_REQUIRED)
-PKG_CHECK_MODULES(LIBSEXY, libsexy >= $LIBSEXY_REQUIRED)
 PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
 PKG_CHECK_MODULES(LIBNOTIFY, libnotify  >= $LIBNOTIFY_REQUIRED)
 PKG_CHECK_MODULES(DEVKIT_DISKS, DeviceKit-disks  >= $DEVKIT_DISKS_REQUIRED)
diff --git a/src/palimpsest/Makefile.am b/src/palimpsest/Makefile.am
index 16db71d..a2b6446 100644
--- a/src/palimpsest/Makefile.am
+++ b/src/palimpsest/Makefile.am
@@ -40,7 +40,6 @@ palimpsest_CFLAGS = 					\
 	$(DBUS_GLIB_CFLAGS)				\
 	$(GNOME_KEYRING_CFLAGS)				\
 	$(GTK2_CFLAGS)					\
-	$(LIBSEXY_CFLAGS)				\
 	$(UNIQUE_CFLAGS)				\
 	$(WARN_CFLAGS)					\
 	$(AM_CFLAGS)
@@ -55,7 +54,6 @@ palimpsest_LDADD = 					\
 	$(DBUS_GLIB_LIBS)				\
 	$(GNOME_KEYRING_LIBS)				\
 	$(GTK2_LIBS)					\
-	$(LIBSEXY_LIBS)					\
 	$(UNIQUE_LIBS)					\
 	$(INTLLIBS)					\
 	$(top_builddir)/src/gdu/libgdu.la		\
diff --git a/src/palimpsest/gdu-shell.c b/src/palimpsest/gdu-shell.c
index 4e00d31..6e2584c 100644
--- a/src/palimpsest/gdu-shell.c
+++ b/src/palimpsest/gdu-shell.c
@@ -28,7 +28,6 @@
 #include <glib-object.h>
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libsexy/sexy.h>
 
 #include <gdu/gdu.h>
 #include <gdu-gtk/gdu-gtk.h>
@@ -421,7 +420,7 @@ details_update (GduShell *shell)
                         detail_str = "";
 
                 s = g_strdup_printf ("<span foreground='%s'>%s</span>", detail_color, detail_str);
-                sexy_url_label_set_markup (SEXY_URL_LABEL (label), s);
+                gtk_label_set_markup (GTK_LABEL (label), s);
                 g_free (s);
         }
 
@@ -1688,18 +1687,6 @@ create_ui_manager (GduShell *shell)
 }
 
 static void
-url_activated (SexyUrlLabel *url_label,
-               const char   *url,
-               gpointer      user_data)
-{
-        char *s;
-        /* TODO: startup notification, determine what file manager to use etc. */
-        s = g_strdup_printf ("nautilus \"%s\"", url);
-        g_spawn_command_line_async (s, NULL);
-        g_free (s);
-}
-
-static void
 fix_focus_cb (GtkDialog *dialog, gpointer data)
 {
         GtkWidget *button;
@@ -1969,30 +1956,26 @@ create_window (GduShell *shell)
         gtk_box_pack_start (GTK_BOX (vbox3), label, FALSE, TRUE, 0);
         shell->priv->name_label = label;
 
-        label = sexy_url_label_new ();
+        label = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_box_pack_start (GTK_BOX (vbox3), label, FALSE, TRUE, 0);
         shell->priv->details0_label = label;
 
-        label = sexy_url_label_new ();
+        label = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_box_pack_start (GTK_BOX (vbox3), label, FALSE, TRUE, 0);
         shell->priv->details1_label = label;
 
-        label = sexy_url_label_new ();
+        label = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_box_pack_start (GTK_BOX (vbox3), label, FALSE, TRUE, 0);
         shell->priv->details2_label = label;
 
-        label = sexy_url_label_new ();
+        label = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_box_pack_start (GTK_BOX (vbox3), label, FALSE, TRUE, 0);
         shell->priv->details3_label = label;
 
-        g_signal_connect (shell->priv->details1_label, "url-activated", (GCallback) url_activated, shell);
-        g_signal_connect (shell->priv->details2_label, "url-activated", (GCallback) url_activated, shell);
-        g_signal_connect (shell->priv->details3_label, "url-activated", (GCallback) url_activated, shell);
-
         /* --- */
 
         shell->priv->sections_vbox = gtk_vbox_new (FALSE, 18);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]