Merge lp:~mterry/update-notifier/gtk3-and-gdbus into lp:update-notifier/ubuntu

[Michael Terry]

Ports to gdbus and gtk3.

=== modified file 'configure.in'
--- configure.in	2010-10-05 16:33:46 +0000
+++ configure.in	2011-07-13 14:29:33 +0000
@@ -12,7 +12,7 @@
 
 GNOME_COMMON_INIT
 
-pkg_modules="gtk+-2.0 >= 2.18.0 gconf-2.0 dbus-glib-1 libnotify gio-2.0 x11"
+pkg_modules="gtk+-3.0 gconf-2.0 libnotify gio-2.0 >= 2.26 x11"
 
 PKG_CHECK_EXISTS(gdu, [ HAVE_GDU=1 ])
 if test "x$HAVE_GDU" != "x"; then
 
=== modified file 'src/crash.c'
--- src/crash.c	2011-06-08 07:28:28 +0000
+++ src/crash.c	2011-07-13 14:29:33 +0000
@@ -176,7 +176,7 @@
 
    // crashreport found 
    if(crashreports_found > 0 && !visible) {
-      gtk_status_icon_set_tooltip(ta->tray_icon,
+      gtk_status_icon_set_tooltip_text(ta->tray_icon,
 				  _("Crash report detected"));
       gtk_status_icon_set_visible(ta->tray_icon, TRUE);
       /* Show the notification, after a delay so it doesn't look ugly
 
=== modified file 'src/hooks.c'
--- src/hooks.c	2011-06-08 07:28:28 +0000
+++ src/hooks.c	2011-07-13 14:29:33 +0000
@@ -48,7 +48,7 @@
 
    updates = _("Information available");
 
-   gtk_status_icon_set_tooltip(un->tray_icon, updates);
+   gtk_status_icon_set_tooltip_text(un->tray_icon, updates);
 }
 
 
 
=== modified file 'src/reboot.c'
--- src/reboot.c	2011-06-08 07:28:28 +0000
+++ src/reboot.c	2011-07-13 14:29:33 +0000
@@ -7,8 +7,7 @@
 #include <unistd.h>
 
 #include <libnotify/notify.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus.h>
+#include <gio/gio.h>
 
 #include "update-notifier.h"
 #include "update.h"
@@ -41,60 +40,56 @@
 static gboolean
 gdm_action_reboot()
 {
-   DBusGConnection *connection;
-   GError *error;
-   DBusGProxy *proxy;
-
-   error = NULL;
-   connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-   if (connection == NULL) {
-      g_error_free (error);
-      return FALSE;
-   }
-
-  proxy = dbus_g_proxy_new_for_name (connection,
-                                     "org.gnome.SessionManager",
-				     "/org/gnome/SessionManager",
-				     "org.gnome.SessionManager");
+  GVariant *answer;
+  GDBusProxy *proxy;
+
+  proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                         G_DBUS_PROXY_FLAGS_NONE,
+                                         NULL, /* GDBusInterfaceInfo */
+                                         "org.gnome.SessionManager",
+                                         "/org/gnome/SessionManager",
+                                         "org.gnome.SessionManager",
+                                         NULL, /* GCancellable */
+                                         NULL /* GError */);
   if (proxy == NULL)
      return FALSE;
 
-  error = NULL;
-  if (!dbus_g_proxy_call (proxy, "RequestReboot", &error, 
-			  G_TYPE_INVALID, G_TYPE_INVALID)) {
-     g_error_free (error);
-     return FALSE;
-  }
+  answer = g_dbus_proxy_call_sync (proxy, "RequestReboot", NULL,
+                                   G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
+  g_object_unref (proxy);
+
+  if (answer == NULL)
+    return FALSE;
+
+  g_variant_unref (answer);
   return TRUE;
 }
 
 static gboolean
 ck_action_reboot()
 {
-   DBusGConnection *connection;
-   GError *error;
-   DBusGProxy *proxy;
-
-   error = NULL;
-   connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-   if (connection == NULL) {
-      g_error_free (error);
-      return FALSE;
-   }
-
-  proxy = dbus_g_proxy_new_for_name (connection,
-                                     "org.freedesktop.ConsoleKit",
-                                     "/org/freedesktop/ConsoleKit/Manager",
-                                     "org.freedesktop.ConsoleKit.Manager");
+  GVariant *answer;
+  GDBusProxy *proxy;
+
+  proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+                                         G_DBUS_PROXY_FLAGS_NONE,
+                                         NULL, /* GDBusInterfaceInfo */
+                                         "org.freedesktop.ConsoleKit",
+                                         "/org/freedesktop/ConsoleKit/Manager",
+                                         "org.freedesktop.ConsoleKit.Manager",
+                                         NULL, /* GCancellable */
+                                         NULL /* GError */);
   if (proxy == NULL)
      return FALSE;
 
-  error = NULL;
-  if (!dbus_g_proxy_call (proxy, "Restart", &error,
-                          G_TYPE_INVALID, G_TYPE_INVALID)) {
-     g_error_free (error);
-     return FALSE;
-  }
+  answer = g_dbus_proxy_call_sync (proxy, "Restart", NULL,
+                                   G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
+  g_object_unref (proxy);
+
+  if (answer == NULL)
+    return FALSE;
+
+  g_variant_unref (answer);
   return TRUE;
 
 }
@@ -130,92 +125,65 @@
 }
 
 static gboolean
-is_aptdaemon_on_the_system_bus ()
-{
-   DBusConnection *connection;
-   DBusError *dbus_error = NULL;
-   DBusMessage *message, *reply;
-   const char *aptdaemon_bus_name = "org.debian.apt";
-   gboolean res;
-
-   connection = dbus_bus_get(DBUS_BUS_SYSTEM, dbus_error);
-   if (dbus_error != NULL) {
-      g_warning("failed to connect to the system bus");
-      return FALSE;
-   }
-   message = dbus_message_new_method_call(DBUS_SERVICE_DBUS, 
-                                          DBUS_PATH_DBUS,
-                                          DBUS_INTERFACE_DBUS,
-                                          "GetNameOwner");
-   if (message == NULL) {
-      g_warning ("failed to create dbus message");
-      return FALSE;
-   }
-   
-   dbus_message_append_args(message,
-                            DBUS_TYPE_STRING, &aptdaemon_bus_name,
-                            DBUS_TYPE_INVALID);
-
-   reply = dbus_connection_send_with_reply_and_block(connection,
-                                                     message,
-                                                     -1,
-                                                     dbus_error);
-   dbus_message_unref(message);
-
-   if (reply) {
-      dbus_message_unref(reply);
-      res = TRUE;
-   } else {
-      res =  FALSE;
-   }
-
-   g_debug("aptdaemon on bus: %i", res);
-   return res;
-}
-
-static gboolean
 aptdaemon_pending_transactions ()
 {
-   DBusGConnection *connection;
-   GError *error;
-   DBusGProxy *proxy;
-   char *current = NULL;
-   char **pending = NULL;
-  
-   if (!is_aptdaemon_on_the_system_bus())
-      return FALSE;
-
-   error = NULL;
-   connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-   if (connection == NULL) {
-      g_debug ("Failed to open connection to bus: %s\n", error->message);
-      g_error_free (error);
-      return FALSE;
-   }
-
-  proxy = dbus_g_proxy_new_for_name (connection,
-                                     "org.debian.apt",
-				     "/org/debian/apt",
-				     "org.debian.apt");
-  error = NULL;
-  if (!dbus_g_proxy_call (proxy, "GetActiveTransactions", &error, 
-			  G_TYPE_INVALID,
-                          G_TYPE_STRING, &current, 
-			  G_TYPE_STRV, &pending,
-			  G_TYPE_INVALID)) {
-     g_debug ("error during dbus call: %s\n", error->message);
-     g_error_free (error);
-     g_object_unref (proxy);
-     return FALSE;
-  }
+  GError *error;
+  GVariant *answer;
+  GDBusProxy *proxy;
+  char *owner = NULL;
+  const char *current = NULL;
+  char **pending = NULL;
+
+  error = NULL;
+  proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+                                         G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+                                         NULL, /* GDBusInterfaceInfo */
+                                         "org.debian.apt",
+                                         "/org/debian/apt",
+                                         "org.debian.apt",
+                                         NULL, /* GCancellable */
+                                         &error);
+  if (proxy == NULL) {
+    g_debug ("Failed to open connection to bus: %s\n", error->message);
+    g_error_free (error);
+    return FALSE;
+  }
+
+  owner = g_dbus_proxy_get_name_owner (proxy);
+  g_debug("aptdaemon on bus: %i", (owner != NULL));
+  if (owner == NULL) {
+    g_object_unref (proxy);
+    g_free (owner);
+    return FALSE;
+  }
+  g_free (owner);
+
+  error = NULL;
+  answer = g_dbus_proxy_call_sync (proxy, "GetActiveTransactions", NULL,
+                                   G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+  g_object_unref (proxy);
+
+  if (answer == NULL) {
+    g_debug ("error during dbus call: %s\n", error->message);
+    g_error_free (error);
+    return FALSE;
+  }
+
+  if (g_strcmp0 (g_variant_get_type_string (answer), "(sas)") != 0) {
+    g_debug ("aptd answer in unexpected format: %s\n",
+             g_variant_get_type_string (answer));
+    g_variant_unref (answer);
+    return FALSE;
+  }
+
+  g_variant_get (answer, "(&s^a&s)", &current, &pending);
 
   gboolean has_pending = FALSE;
   if ((current && strcmp(current,"") != 0) || g_strv_length(pending) > 0)
      has_pending = TRUE;
 
-  g_object_unref (proxy);
-  g_free (current);
-  g_strfreev (pending);
+  g_free (pending);
+  g_variant_unref (answer);
 
   return has_pending;
 }
@@ -254,7 +222,7 @@
 	/* Skip the rest if the icon is already visible */
 	if (gtk_status_icon_get_visible (ta->tray_icon))
 	   return;
-	gtk_status_icon_set_tooltip (ta->tray_icon,  
+	gtk_status_icon_set_tooltip_text (ta->tray_icon,  
 				     _("System restart required"));
 	gtk_status_icon_set_visible (ta->tray_icon, TRUE);
 
 
=== modified file 'src/update.c'
--- src/update.c	2011-06-08 07:28:28 +0000
+++ src/update.c	2011-07-13 14:29:33 +0000
@@ -8,12 +8,12 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <gio/gio.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <dbus/dbus-glib.h>
 
 #include "update-notifier.h"
 #include "update.h"
@@ -94,7 +94,7 @@
 				      "There are %i updates available",
 				      num_upgrades),
 			     num_upgrades);
-   gtk_status_icon_set_tooltip(ta->tray_icon, updates);
+   gtk_status_icon_set_tooltip_text(ta->tray_icon, updates);
    g_free(updates);
 }
 
@@ -216,7 +216,7 @@
       }
 
       // and update the tooltip
-      gtk_status_icon_set_tooltip(ta->tray_icon, _("A package manager is working"));
+      gtk_status_icon_set_tooltip_text(ta->tray_icon, _("A package manager is working"));
       // and show it
       gtk_status_icon_set_visible(ta->tray_icon, TRUE);
 
@@ -279,7 +279,7 @@
 void 
 show_error(TrayApplet *ta, gchar *error_str)
 {
-   gtk_status_icon_set_tooltip(ta->tray_icon, error_str);
+   gtk_status_icon_set_tooltip_text(ta->tray_icon, error_str);
    gtk_status_icon_set_from_icon_name(ta->tray_icon, "dialog-error");
    gtk_status_icon_set_visible(ta->tray_icon, TRUE);
 }
@@ -298,7 +298,7 @@
 						NULL);
       gtk_status_icon_set_from_pixbuf(ta->tray_icon, src);
       g_object_unref(src);
-      gtk_status_icon_set_tooltip(ta->tray_icon,
+      gtk_status_icon_set_tooltip_text(ta->tray_icon,
 				  _("The update information is outdated. "
 				    "This may be caused by network "
 				    "problems or by a repository that "
@@ -320,34 +320,47 @@
 static gboolean
 dpkg_lock_is_taken ()
 {
-   DBusGConnection *connection;
-   GError *error;
-   DBusGProxy *proxy;
-   gboolean locked = FALSE;
+  GError *error;
+  GVariant *answer;
+  GDBusProxy *proxy;
+  gboolean locked = FALSE;
   
-   error = NULL;
-   connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-   if (connection == NULL) {
-      g_debug_update ("Failed to open connection to bus: %s\n", error->message);
-      g_error_free (error);
-      return FALSE;
-   }
+  error = NULL;
+  proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+                                         G_DBUS_PROXY_FLAGS_NONE,
+                                         NULL, /* GDBusInterfaceInfo */
+                                         "com.ubuntu.SystemService",
+                                         "/",
+                                         "com.ubuntu.SystemService",
+                                         NULL, /* GCancellable */
+                                         &error);
+  if (proxy == NULL) {
+    g_debug_update ("Failed to open connection to bus: %s\n", error->message);
+    g_error_free (error);
+    return FALSE;
+  }
 
-  proxy = dbus_g_proxy_new_for_name (connection,
-                                     "com.ubuntu.SystemService",
-				     "/",
-				     "com.ubuntu.SystemService");
   error = NULL;
-  if (!dbus_g_proxy_call (proxy, "is_package_system_locked", &error, 
-			  G_TYPE_INVALID,
-                          G_TYPE_BOOLEAN, &locked, G_TYPE_INVALID)) {
-     g_debug_update ("error during dbus call: %s\n", error->message);
-     g_error_free (error);
-     g_object_unref (proxy);
-     return FALSE;
-  }
+  answer = g_dbus_proxy_call_sync (proxy, "is_package_system_locked", NULL,
+                                   G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
   g_object_unref (proxy);
 
+  if (answer == NULL) {
+    g_debug_update ("error during dbus call: %s\n", error->message);
+    g_error_free (error);
+    return FALSE;
+  }
+
+  if (g_strcmp0 (g_variant_get_type_string (answer), "(b)") != 0) {
+    g_debug_update ("SystemService answer in unexpected format: %s\n",
+                    g_variant_get_type_string (answer));
+    g_variant_unref (answer);
+    return FALSE;
+  }
+
+  g_variant_get (answer, "(b)", &locked);
+  g_variant_unref (answer);
+
   g_debug_update ("is_package_system_locked: %i", locked);
   return locked;
 }
 
=== modified file 'ui/hooks-dialog.ui'
--- ui/hooks-dialog.ui	2009-06-26 15:59:09 +0000
+++ ui/hooks-dialog.ui	2011-07-13 14:29:33 +0000
@@ -1,219 +1,196 @@
-<?xml version="1.0"?>
-<!--*- mode: xml -*-->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="dialog_hooks">
+    <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes"/>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_NONE</property>
     <property name="modal">True</property>
     <property name="default_width">550</property>
     <property name="default_height">400</property>
-    <property name="resizable">True</property>
-    <property name="destroy_with_parent">False</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
-    <property name="has_separator">False</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="homogeneous">False</property>
+        <property name="can_focus">False</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_cancel">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-close</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">6</property>
-            <property name="visible">True</property>
-            <property name="homogeneous">False</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkImage" id="image">
                     <property name="visible">True</property>
-                    <property name="stock">gtk-dialog-info</property>
-                    <property name="icon_size">6</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
+                    <property name="stock">gtk-dialog-info</property>
+                    <property name="icon-size">6</property>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="vbox_messages">
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="label_title">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;span weight="bold" size="larger"&gt;Update information&lt;/span&gt;</property>
-                        <property name="use_underline">False</property>
                         <property name="use_markup">True</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">True</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTextView" id="textview_hook">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="editable">False</property>
-                        <property name="overwrite">False</property>
-                        <property name="accepts_tab">True</property>
-                        <property name="justification">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap_mode">GTK_WRAP_WORD</property>
-                        <property name="cursor_visible">False</property>
                         <property name="pixels_above_lines">2</property>
                         <property name="pixels_below_lines">2</property>
-                        <property name="pixels_inside_wrap">0</property>
+                        <property name="editable">False</property>
+                        <property name="wrap_mode">word</property>
                         <property name="left_margin">2</property>
                         <property name="right_margin">2</property>
-                        <property name="indent">0</property>
+                        <property name="cursor_visible">False</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="button_run">
-                        <property name="visible">True</property>
-                        <property name="can_default">True</property>
-                        <property name="can_focus">True</property>
                         <property name="label" translatable="yes">_Run this action now</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <signal handler="on_button_run_clicked" last_modification_time="Thu, 13 Jan 2005 10:13:21 GMT" name="clicked"/>
+                        <signal name="clicked" handler="on_button_run_clicked" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="button_next">
-                        <property name="visible">True</property>
-                        <property name="can_default">True</property>
-                        <property name="can_focus">True</property>
                         <property name="label">gtk-media-next</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <signal handler="on_button_next_clicked" last_modification_time="Thu, 13 Jan 2005 10:17:50 GMT" name="clicked"/>
+                        <signal name="clicked" handler="on_button_next_clicked" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="pack_type">GTK_PACK_END</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
             <property name="expand">True</property>
             <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
 
=== modified file 'ui/reboot-dialog.ui'
--- ui/reboot-dialog.ui	2009-09-10 10:20:07 +0000
+++ ui/reboot-dialog.ui	2011-07-13 14:29:33 +0000
@@ -1,93 +1,65 @@
-<?xml version="1.0"?>
-<!--*- mode: xml -*-->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="dialog_reboot">
+    <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Restart Required</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_NONE</property>
+    <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="resizable">False</property>
-    <property name="destroy_with_parent">False</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
-    <property name="has_separator">False</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="homogeneous">False</property>
+        <property name="can_focus">False</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_cancel">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <child>
                   <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
+                    <property name="can_focus">False</property>
                     <property name="xscale">0</property>
                     <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
                     <child>
                       <object class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">2</property>
                         <child>
                           <object class="GtkImage" id="image1">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="stock">gtk-cancel</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label1">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Restart _Later</property>
                             <property name="use_underline">True</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
@@ -95,68 +67,53 @@
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button_run">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <child>
                   <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
+                    <property name="can_focus">False</property>
                     <property name="xscale">0</property>
                     <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
                     <child>
                       <object class="GtkHBox" id="hbox3">
                         <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">2</property>
                         <child>
                           <object class="GtkImage" id="image2">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="stock">gtk-yes</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">_Restart Now</property>
                             <property name="use_underline">True</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
@@ -164,82 +121,77 @@
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">6</property>
-            <property name="visible">True</property>
-            <property name="homogeneous">False</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkImage" id="image">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="vbox_messages">
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="label_message">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">The computer needs to restart to finish installing updates. Please save your work before continuing.</property>
-                        <property name="use_underline">False</property>
                         <property name="use_markup">True</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">True</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -247,9 +199,9 @@
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
             <property name="expand">True</property>
             <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>