gnome-packagekit r118 - trunk/src

[rhughes svn gnome org]

Author: rhughes
Date: Tue Mar 11 23:59:52 2008
New Revision: 118
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=118&view=rev

Log:
from git

Modified:
   trunk/src/pk-application.c
   trunk/src/pk-backend-status.c
   trunk/src/pk-notify.c
   trunk/src/pk-progress.c
   trunk/src/pk-smart-icon.c
   trunk/src/pk-statusbar.c
   trunk/src/pk-update-viewer.c
   trunk/src/pk-watch.c

Modified: trunk/src/pk-application.c
==============================================================================
--- trunk/src/pk-application.c	(original)
+++ trunk/src/pk-application.c	Tue Mar 11 23:59:52 2008
@@ -321,7 +321,7 @@
 	g_signal_connect (client, "finished",
 			  G_CALLBACK (pk_application_requires_finished_cb), application);
 	pk_debug ("getting requires for %s", application->priv->package);
-	pk_client_get_requires (client, application->priv->package, TRUE, NULL);
+	pk_client_get_requires (client, "installed", application->priv->package, TRUE, NULL);
 }
 
 /**
@@ -994,7 +994,7 @@
 		/* get the filelist */
 		pk_client_reset (application->priv->client_files, NULL);
 		pk_client_set_use_buffer (application->priv->client_files, TRUE, NULL);
-		pk_client_get_depends (application->priv->client_files,
+		pk_client_get_depends (application->priv->client_files, "none",
 				       application->priv->package, FALSE, NULL);
 
 		return TRUE;
@@ -1017,7 +1017,7 @@
 		/* get the filelist */
 		pk_client_reset (application->priv->client_files, NULL);
 		pk_client_set_use_buffer (application->priv->client_files, TRUE, NULL);
-		pk_client_get_requires (application->priv->client_files,
+		pk_client_get_requires (application->priv->client_files, "none",
 				        application->priv->package, TRUE, NULL);
 
 		return TRUE;
@@ -1135,7 +1135,7 @@
 /**
  * pk_application_create_custom_widget:
  **/
-GtkWidget *
+static GtkWidget *
 pk_application_create_custom_widget (GladeXML *xml, gchar *func_name, gchar *name,
 				     gchar *string1, gchar *string2,
 				     gint int1, gint int2, gpointer user_data)
@@ -1289,7 +1289,7 @@
  *
  * Creates a tree model containing the completions
  **/
-GtkTreeModel *
+static GtkTreeModel *
 pk_application_create_completion_model (void)
 {
 	GtkListStore *store;
@@ -1321,12 +1321,16 @@
 	GtkWidget *main_window;
 	GtkWidget *vbox;
 	GtkWidget *widget;
+	GtkEntryCompletion *completion;
+	GtkTreeModel *completion_model;
+	GtkTreeSelection *selection;
+	gboolean autocomplete;
 	PkGroupEnum group;
-	gboolean ret;
 	gchar *locale; /* does not need to be freed */
 	guint length;
 	guint page;
 	guint i;
+	gboolean ret;
 
 	application->priv = PK_APPLICATION_GET_PRIVATE (application);
 	application->priv->package = NULL;
@@ -1406,7 +1410,7 @@
 	application->priv->extra = pk_extra_new ();
 	ret = pk_extra_set_database (application->priv->extra, "/var/lib/PackageKit/extra-data.db");
 	if (!ret) {
-		pk_warning ("could not connect to extra database");
+		pk_warning ("Failure setting database");
 	}
 
 	/* set the locale */
@@ -1487,9 +1491,6 @@
 	gtk_widget_set_tooltip_text (widget, _("Find packages"));
 
 	/* the fancy text entry widget */
-	GtkEntryCompletion *completion;
-	GtkTreeModel *completion_model;
-	gboolean autocomplete;
 	widget = glade_xml_get_widget (application->priv->glade_xml, "entry_text");
 
 	/* autocompletion can be turned off as it's slow */
@@ -1605,8 +1606,6 @@
 	gtk_widget_hide (GTK_WIDGET (widget));
 	gtk_widget_show (GTK_WIDGET (widget));
 
-	GtkTreeSelection *selection;
-
 	/* use the in-statusbar for progress */
 	application->priv->statusbar = pk_statusbar_new ();
 	widget = glade_xml_get_widget (application->priv->glade_xml, "statusbar_status");

Modified: trunk/src/pk-backend-status.c
==============================================================================
--- trunk/src/pk-backend-status.c	(original)
+++ trunk/src/pk-backend-status.c	Tue Mar 11 23:59:52 2008
@@ -70,6 +70,12 @@
 	GOptionContext *context;
 	GtkWidget *widget;
 	GladeXML *glade_xml;
+	gchar *name;
+	gchar *author;
+	PkEnumList *role_list;
+	PkEnumList *filter_list;
+	PkClient *client;
+	gboolean retval;
 
 	const GOptionEntry options[] = {
 		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
@@ -107,12 +113,6 @@
 
 	loop = g_main_loop_new (NULL, FALSE);
 
-	gchar *name;
-	gchar *author;
-	PkEnumList *role_list;
-	PkEnumList *filter_list;
-	PkClient *client;
-	gboolean retval;
 	client = pk_client_new ();
 	role_list = pk_client_get_actions (client);
 	filter_list = pk_client_get_filters (client);

Modified: trunk/src/pk-notify.c
==============================================================================
--- trunk/src/pk-notify.c	(original)
+++ trunk/src/pk-notify.c	Tue Mar 11 23:59:52 2008
@@ -170,6 +170,7 @@
 static void
 pk_notify_show_about_cb (GtkMenuItem *item, gpointer data)
 {
+	static gboolean been_here = FALSE;
 	const char *authors[] = {
 		"Richard Hughes <richard hughsie com>",
 		NULL};
@@ -205,7 +206,6 @@
 				     _(license[2]), "\n\n", _(license[3]), "\n",  NULL);
 
 	/* FIXME: unnecessary with libgnomeui >= 2.16.0 */
-	static gboolean been_here = FALSE;
 	if (!been_here) {
 		been_here = TRUE;
 		gtk_about_dialog_set_url_hook (pk_notify_about_dialog_url_cb, NULL, NULL);
@@ -303,7 +303,7 @@
 
 	/* we failed, show the icon */
 	if (exit_code != PK_EXIT_ENUM_SUCCESS) {
-		pk_smart_icon_set_icon_name (notify->priv->sicon, FALSE);
+		pk_smart_icon_set_icon_name (notify->priv->sicon, NULL);
 		/* we failed, so re-get the update list */
 		pk_notify_query_updates (notify);
 	}

Modified: trunk/src/pk-progress.c
==============================================================================
--- trunk/src/pk-progress.c	(original)
+++ trunk/src/pk-progress.c	Tue Mar 11 23:59:52 2008
@@ -178,7 +178,7 @@
 /**
  * pk_progress_finished_timeout:
  **/
-gboolean
+static gboolean
 pk_progress_finished_timeout (gpointer data)
 {
 	PkProgress *progress = PK_PROGRESS (data);
@@ -226,7 +226,7 @@
 /**
  * pk_progress_spin_timeout_percentage:
  **/
-gboolean
+static gboolean
 pk_progress_spin_timeout_percentage (gpointer data)
 {
 	GtkWidget *widget;
@@ -251,7 +251,7 @@
 /**
  * pk_progress_spin_timeout_subpercentage:
  **/
-gboolean
+static gboolean
 pk_progress_spin_timeout_subpercentage (gpointer data)
 {
 	GtkWidget *widget;

Modified: trunk/src/pk-smart-icon.c
==============================================================================
--- trunk/src/pk-smart-icon.c	(original)
+++ trunk/src/pk-smart-icon.c	Tue Mar 11 23:59:52 2008
@@ -225,7 +225,7 @@
 		sicon->priv->dialog = notify_notification_new (title, message, icon, NULL);
 	}
 	notify_notification_set_timeout (sicon->priv->dialog, timeout_val);
-	notify_notification_set_urgency (sicon->priv->dialog, urgency);
+	notify_notification_set_urgency (sicon->priv->dialog, (NotifyUrgency) urgency);
 	return TRUE;
 }
 

Modified: trunk/src/pk-statusbar.c
==============================================================================
--- trunk/src/pk-statusbar.c	(original)
+++ trunk/src/pk-statusbar.c	Tue Mar 11 23:59:52 2008
@@ -112,7 +112,7 @@
 /**
  * pk_statusbar_pulse_timeout:
  **/
-gboolean
+static gboolean
 pk_statusbar_pulse_timeout (gpointer data)
 {
 	PkStatusbar *sbar = (PkStatusbar *) data;

Modified: trunk/src/pk-update-viewer.c
==============================================================================
--- trunk/src/pk-update-viewer.c	(original)
+++ trunk/src/pk-update-viewer.c	Tue Mar 11 23:59:52 2008
@@ -286,7 +286,9 @@
 pk_updates_add_description_item (const gchar *title, const gchar *text, const gchar *uri)
 {
 	gchar *markup;
+	GtkWidget *tree_view;
 	GtkTreeIter iter;
+	GtkTreeSelection *selection;
 
 	/* format */
 	markup = g_strdup_printf ("<b>%s:</b>", title);
@@ -301,8 +303,6 @@
 
 	g_free (markup);
 
-	GtkWidget *tree_view;
-	GtkTreeSelection *selection;
 	tree_view = glade_xml_get_widget (glade_xml, "treeview_description");
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_NONE);

Modified: trunk/src/pk-watch.c
==============================================================================
--- trunk/src/pk-watch.c	(original)
+++ trunk/src/pk-watch.c	Tue Mar 11 23:59:52 2008
@@ -432,6 +432,7 @@
 static void
 pk_watch_show_about_cb (GtkMenuItem *item, gpointer data)
 {
+	static gboolean been_here = FALSE;
 	const char *authors[] = {
 		"Richard Hughes <richard hughsie com>",
 		NULL};
@@ -467,7 +468,6 @@
 				     _(license[2]), "\n\n", _(license[3]), "\n",  NULL);
 
 	/* FIXME: unnecessary with libgnomeui >= 2.16.0 */
-	static gboolean been_here = FALSE;
 	if (!been_here) {
 		been_here = TRUE;
 		gtk_about_dialog_set_url_hook (pk_watch_about_dialog_url_cb, NULL, NULL);