GNOME.org
 

gnome-packagekit r326 - trunk/src

Author: rhughes
Date: Tue Oct  7 16:16:05 2008
New Revision: 326
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=326&view=rev

Log:
from git

Modified:
   trunk/src/Makefile.am
   trunk/src/gpk-application.c
   trunk/src/gpk-backend-status.c
   trunk/src/gpk-client-chooser.c
   trunk/src/gpk-client-dialog.c
   trunk/src/gpk-client-eula.c
   trunk/src/gpk-client-run.c
   trunk/src/gpk-client-signature.c
   trunk/src/gpk-client-untrusted.c
   trunk/src/gpk-client.c
   trunk/src/gpk-common.h
   trunk/src/gpk-error.c
   trunk/src/gpk-log.c
   trunk/src/gpk-prefs.c
   trunk/src/gpk-repo.c
   trunk/src/gpk-update-icon.c
   trunk/src/gpk-update-viewer.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Oct  7 16:16:05 2008
@@ -21,7 +21,7 @@
 	-DLIBDIR=\""$(libdir)"\" 			\
 	-DLOCALEDIR=\""$(localedir)"\"			\
 	-DVERSION="\"$(VERSION)\"" 			\
-	-DPK_DATA=\"$(pkgdatadir)\"			\
+	-DGPK_DATA=\"$(pkgdatadir)\"			\
 	-DEGG_LOG_FILE=\"\"				\
 	-DEGG_VERBOSE="\"GPK_VERBOSE\""			\
 	-DEGG_LOGGING="\"GPK_LOGGING\""			\
@@ -52,6 +52,8 @@
 	egg-string-list.h				\
 	egg-unique.c					\
 	egg-unique.h					\
+	egg-obj-list.c					\
+	egg-obj-list.h					\
 	egg-dbus-monitor.c				\
 	egg-dbus-monitor.h				\
 	gpk-enum.c					\

Modified: trunk/src/gpk-application.c
==============================================================================
--- trunk/src/gpk-application.c	(original)
+++ trunk/src/gpk-application.c	Tue Oct  7 16:16:05 2008
@@ -42,9 +42,11 @@
 #include <pk-package-list.h>
 #include <pk-extra.h>
 #include <pk-details-obj.h>
+#include <pk-category-obj.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"
+#include "egg-obj-list.h"
 
 #include "gpk-client.h"
 #include "gpk-common.h"
@@ -90,7 +92,7 @@
 	GladeXML		*glade_xml;
 	GConfClient		*gconf_client;
 	GtkListStore		*packages_store;
-	GtkListStore		*groups_store;
+	GtkTreeStore		*groups_store;
 	GtkListStore		*details_store;
 	PkControl		*control;
 	PkClient		*client_search;
@@ -1033,7 +1035,7 @@
 
 	/* use the localised summary if available */
 	summary_new = pk_extra_get_summary (application->priv->extra, obj->id->name);
-	if (summary_new == NULL)
+	if (TRUE || summary_new == NULL)
 		summary_new = obj->summary;
 
 	/* mark as got so we don't warn */
@@ -1830,11 +1832,11 @@
 	const gchar *icon_name;
 	const gchar *text;
 
-	gtk_list_store_append (application->priv->groups_store, &iter);
+	gtk_tree_store_append (application->priv->groups_store, &iter, NULL);
 
 	text = gpk_group_enum_to_localised_text (group);
 	icon_name = gpk_group_enum_to_icon_name (group);
-	gtk_list_store_set (application->priv->groups_store, &iter,
+	gtk_tree_store_set (application->priv->groups_store, &iter,
 			    GROUPS_COLUMN_NAME, text,
 			    GROUPS_COLUMN_ID, pk_group_enum_to_text (group),
 			    GROUPS_COLUMN_ICON, icon_name,
@@ -2635,6 +2637,154 @@
 }
 
 /**
+ * gpk_application_create_group_list_enum:
+ **/
+static gboolean
+gpk_application_create_group_list_enum (GpkApplication *application)
+{
+	GtkWidget *widget;
+	guint i;
+
+	/* no group information */
+	if (application->priv->groups == 0)
+		return FALSE;
+
+	/* add this at the top of the list */
+	if (pk_bitfield_contain (application->priv->groups, PK_GROUP_ENUM_COLLECTIONS))
+		gpk_application_group_add_data (application, PK_GROUP_ENUM_COLLECTIONS);
+
+	/* only if we can do both */
+	if ((pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_GET_PACKAGES) ||
+	     pk_bitfield_contain (application->priv->groups, PK_GROUP_ENUM_COLLECTIONS)) &&
+	     pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_GROUP)) {
+		GtkTreeIter iter;
+
+		/* add a separator */
+		gtk_tree_store_append (application->priv->groups_store, &iter, NULL);
+		gtk_tree_store_set (application->priv->groups_store, &iter,
+				    GROUPS_COLUMN_ID, "separator", -1);
+
+		/* use the seporator */
+		widget = glade_xml_get_widget (application->priv->glade_xml, "treeview_groups");
+		gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (widget),
+						      gpk_application_group_row_separator_func, NULL, NULL);
+	}
+
+	/* create group tree view if we can search by group */
+	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_GROUP)) {
+		/* add all the groups supported (except collections, which we handled above */
+		for (i=0; i<PK_GROUP_ENUM_UNKNOWN; i++) {
+			if (pk_bitfield_contain (application->priv->groups, i) &&
+			    i != PK_GROUP_ENUM_COLLECTIONS)
+				gpk_application_group_add_data (application, i);
+		}
+	}
+
+	/* we populated the menu  */
+	return TRUE;
+}
+
+/**
+ * gpk_application_categories_finished_cb:
+ **/
+static void
+gpk_application_categories_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, GpkApplication *application)
+{
+	const GPtrArray	*categories;
+	EggObjList *list;
+	const PkCategoryObj *obj;
+	const PkCategoryObj *obj2;
+	GtkTreeIter iter;
+	GtkTreeIter iter2;
+	guint i, j;
+	GtkWidget *widget;
+
+	/* get return values */
+	categories = pk_client_get_cached_objects (client);
+	if (categories->len == 0) {
+		egg_warning ("no results from GetCategories");
+		goto out;
+	}
+
+	/* copy the categories into a list so we can remove then */
+	list = egg_obj_list_new ();
+	egg_obj_list_set_copy (list, (EggObjListCopyFunc) pk_category_obj_copy);
+	egg_obj_list_set_free (list, (EggObjListFreeFunc) pk_category_obj_free);
+	egg_obj_list_add_array (list, categories);
+
+	for (i=0; i < list->len; i++) {
+		obj = egg_obj_list_index (list, i);
+
+		gtk_tree_store_append (application->priv->groups_store, &iter, NULL);
+		gtk_tree_store_set (application->priv->groups_store, &iter,
+				    GROUPS_COLUMN_NAME, obj->name,
+				    GROUPS_COLUMN_ID, obj->cat_id,
+				    GROUPS_COLUMN_ICON, obj->icon, -1);
+		j = 0;
+		do {
+			/* only allows groups two layers deep */
+			obj2 = egg_obj_list_index (list, j);
+			if (egg_strequal (obj2->parent_id, obj->cat_id)) {
+				egg_debug ("%s is child to %s", obj2->name, obj->name);
+				gtk_tree_store_append (application->priv->groups_store, &iter2, &iter);
+				gtk_tree_store_set (application->priv->groups_store, &iter2,
+						    GROUPS_COLUMN_NAME, obj2->name,
+						    GROUPS_COLUMN_ID, obj2->cat_id,
+						    GROUPS_COLUMN_ICON, obj2->icon, -1);
+				egg_obj_list_remove (list, obj2);
+			} else
+				j++;
+		} while (j < list->len);
+	}
+
+	/* open all expanders */
+	widget = glade_xml_get_widget (application->priv->glade_xml, "treeview_groups");
+	gtk_tree_view_expand_all (GTK_TREE_VIEW (widget));
+
+	g_object_unref (list);
+out:
+	g_object_unref (client);
+}
+
+/**
+ * gpk_application_create_group_list_categories:
+ **/
+static gboolean
+gpk_application_create_group_list_categories (GpkApplication *application)
+{
+	GError *error = NULL;
+	PkClient *client;
+	gboolean ret;
+
+	/* check we can do this */
+	if (!pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_GET_CATEGORIES)) {
+		egg_warning ("backend does not support complex groups");
+		return FALSE;
+	}
+
+	/* async */
+	client = pk_client_new ();
+	pk_client_set_use_buffer (client, TRUE, NULL);
+	g_signal_connect (client, "finished",
+			  G_CALLBACK (gpk_application_categories_finished_cb), application);
+	g_signal_connect (client, "finished",
+			  G_CALLBACK (gpk_application_finished_cb), application);
+	g_signal_connect (client, "status-changed",
+			  G_CALLBACK (gpk_application_status_changed_cb), application);
+
+	/* get categories supported */
+	ret = pk_client_get_categories (client, &error);
+	if (!ret) {
+		egg_warning ("failed to get categories: %s", error->message);
+		g_error_free (error);
+		g_object_unref (client);
+	}
+
+	/* client will be unreff'd in finished handler */
+	return ret;
+}
+
+/**
  * gpk_application_init:
  **/
 static void
@@ -2647,7 +2797,6 @@
 	GtkTreeSelection *selection;
 	gboolean autocomplete;
 	gboolean enabled;
-	guint i;
 	gboolean ret;
 	GError *error = NULL;
 
@@ -2674,7 +2823,7 @@
 							        G_TYPE_BOOLEAN,
 							        G_TYPE_STRING,
 							        G_TYPE_STRING);
-	application->priv->groups_store = gtk_list_store_new (GROUPS_COLUMN_LAST,
+	application->priv->groups_store = gtk_tree_store_new (GROUPS_COLUMN_LAST,
 							      G_TYPE_STRING,
 							      G_TYPE_STRING,
 							      G_TYPE_STRING);
@@ -2685,7 +2834,9 @@
 
 	/* add application specific icons to search path */
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-                                           PK_DATA G_DIR_SEPARATOR_S "icons");
+					   GPK_DATA G_DIR_SEPARATOR_S "icons");
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+					   "/usr/share/PackageKit/icons");
 
 	application->priv->control = pk_control_new ();
 	application->priv->gclient = gpk_client_new ();
@@ -2760,7 +2911,7 @@
 	/* use custom widgets */
 	glade_set_custom_handler (gpk_application_create_custom_widget, application);
 
-	application->priv->glade_xml = glade_xml_new (PK_DATA "/gpk-application.glade", NULL, NULL);
+	application->priv->glade_xml = glade_xml_new (GPK_DATA "/gpk-application.glade", NULL, NULL);
 	main_window = glade_xml_get_widget (application->priv->glade_xml, "window_manager");
 
 	/* make GpkClient windows modal */
@@ -3093,9 +3244,9 @@
 	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_GET_PACKAGES)) {
 		GtkTreeIter iter;
 		const gchar *icon_name;
-		gtk_list_store_append (application->priv->groups_store, &iter);
+		gtk_tree_store_append (application->priv->groups_store, &iter, NULL);
 		icon_name = gpk_role_enum_to_icon_name (PK_ROLE_ENUM_GET_PACKAGES);
-		gtk_list_store_set (application->priv->groups_store, &iter,
+		gtk_tree_store_set (application->priv->groups_store, &iter,
 				    GROUPS_COLUMN_NAME, _("All packages"),
 				    GROUPS_COLUMN_ID, "all-packages",
 				    GROUPS_COLUMN_ICON, icon_name, -1);
@@ -3103,6 +3254,11 @@
 
 	/* set up the groups checkbox */
 	widget = glade_xml_get_widget (application->priv->glade_xml, "treeview_groups");
+
+	/* add columns to the tree view */
+	gpk_application_groups_add_columns (GTK_TREE_VIEW (widget));
+	gtk_tree_view_set_show_expanders (GTK_TREE_VIEW (widget), FALSE);
+	gtk_tree_view_set_level_indentation  (GTK_TREE_VIEW (widget), 9);
 	gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
 				 GTK_TREE_MODEL (application->priv->groups_store));
 
@@ -3110,39 +3266,14 @@
 	g_signal_connect (selection, "changed",
 			  G_CALLBACK (gpk_application_groups_treeview_clicked_cb), application);
 
-	/* add this at the top of the list */
-	if (pk_bitfield_contain (application->priv->groups, PK_GROUP_ENUM_COLLECTIONS))
-		gpk_application_group_add_data (application, PK_GROUP_ENUM_COLLECTIONS);
-
-	/* only if we can do both */
-	if ((pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_GET_PACKAGES) ||
-	     pk_bitfield_contain (application->priv->groups, PK_GROUP_ENUM_COLLECTIONS)) &&
-	    pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_GROUP)) {
-		GtkTreeIter iter;
-
-		/* add a separator */
-		gtk_list_store_append (application->priv->groups_store, &iter);
-		gtk_list_store_set (application->priv->groups_store, &iter,
-				    GROUPS_COLUMN_ID, "separator", -1);
-
-		/* use the seporator */
-		widget = glade_xml_get_widget (application->priv->glade_xml, "treeview_groups");
-		gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (widget),
-						      gpk_application_group_row_separator_func, NULL, NULL);
-	}
-
-	/* create group tree view if we can search by group */
-	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_GROUP)) {
-		/* add columns to the tree view */
-		gpk_application_groups_add_columns (GTK_TREE_VIEW (widget));
+	/* simple list or category tree? */
+	ret = gconf_client_get_bool (application->priv->gconf_client, GPK_CONF_APPLICATION_CATEGORY_GROUPS, NULL);
+	if (ret)
+		ret = gpk_application_create_group_list_categories (application);
 
-		/* add all the groups supported (except collections, which we handled above */
-		for (i=0; i<PK_GROUP_ENUM_UNKNOWN; i++) {
-			if (pk_bitfield_contain (application->priv->groups, i) &&
-			    i != PK_GROUP_ENUM_COLLECTIONS)
-				gpk_application_group_add_data (application, i);
-		}
-	}
+	/* fallback to creating a simple list if we can't do category list */
+	if (!ret)
+		gpk_application_create_group_list_enum (application);
 
 	/* get repos, so we can show the full name in the software source box */
 	ret = pk_client_get_repo_list (application->priv->client_action, PK_FILTER_ENUM_NONE, &error);

Modified: trunk/src/gpk-backend-status.c
==============================================================================
--- trunk/src/gpk-backend-status.c	(original)
+++ trunk/src/gpk-backend-status.c	Tue Oct  7 16:16:05 2008
@@ -123,7 +123,7 @@
 		return 1;
 	}
 
-	glade_xml = glade_xml_new (PK_DATA "/gpk-backend-status.glade", NULL, NULL);
+	glade_xml = glade_xml_new (GPK_DATA "/gpk-backend-status.glade", NULL, NULL);
 
 	widget = glade_xml_get_widget (glade_xml, "button_close");
 	g_signal_connect (widget, "clicked",

Modified: trunk/src/gpk-client-chooser.c
==============================================================================
--- trunk/src/gpk-client-chooser.c	(original)
+++ trunk/src/gpk-client-chooser.c	Tue Oct  7 16:16:05 2008
@@ -193,7 +193,7 @@
 	/* use custom widgets */
 	glade_set_custom_handler (gpk_update_viewer_create_custom_widget, NULL);
 
-	glade_xml = glade_xml_new (PK_DATA "/gpk-log.glade", NULL, NULL);
+	glade_xml = glade_xml_new (GPK_DATA "/gpk-log.glade", NULL, NULL);
 
 	/* connect up default actions */
 	widget = glade_xml_get_widget (glade_xml, "window_simple");

Modified: trunk/src/gpk-client-dialog.c
==============================================================================
--- trunk/src/gpk-client-dialog.c	(original)
+++ trunk/src/gpk-client-dialog.c	Tue Oct  7 16:16:05 2008
@@ -739,7 +739,7 @@
 	/* use custom widgets */
 	glade_set_custom_handler (gpk_client_create_custom_widget, dialog);
 
-	dialog->priv->glade_xml = glade_xml_new (PK_DATA "/gpk-client.glade", NULL, NULL);
+	dialog->priv->glade_xml = glade_xml_new (GPK_DATA "/gpk-client.glade", NULL, NULL);
 	dialog->priv->loop = g_main_loop_new (NULL, FALSE);
 	dialog->priv->response = GTK_RESPONSE_NONE;
 	dialog->priv->pulse_timer_id = 0;

Modified: trunk/src/gpk-client-eula.c
==============================================================================
--- trunk/src/gpk-client-eula.c	(original)
+++ trunk/src/gpk-client-eula.c	Tue Oct  7 16:16:05 2008
@@ -75,7 +75,7 @@
 	g_return_val_if_fail (vendor_name != NULL, FALSE);
 	g_return_val_if_fail (license_agreement != NULL, FALSE);
 
-	glade_xml = glade_xml_new (PK_DATA "/gpk-eula.glade", NULL, NULL);
+	glade_xml = glade_xml_new (GPK_DATA "/gpk-eula.glade", NULL, NULL);
 
 	/* connect up default actions */
 	widget = glade_xml_get_widget (glade_xml, "window_eula");

Modified: trunk/src/gpk-client-run.c
==============================================================================
--- trunk/src/gpk-client-run.c	(original)
+++ trunk/src/gpk-client-run.c	Tue Oct  7 16:16:05 2008
@@ -306,7 +306,7 @@
 	/* use custom widgets */
 	glade_set_custom_handler (gpk_update_viewer_create_custom_widget, NULL);
 
-	glade_xml = glade_xml_new (PK_DATA "/gpk-log.glade", NULL, NULL);
+	glade_xml = glade_xml_new (GPK_DATA "/gpk-log.glade", NULL, NULL);
 
 	/* connect up default actions */
 	widget = glade_xml_get_widget (glade_xml, "window_simple");

Modified: trunk/src/gpk-client-signature.c
==============================================================================
--- trunk/src/gpk-client-signature.c	(original)
+++ trunk/src/gpk-client-signature.c	Tue Oct  7 16:16:05 2008
@@ -69,7 +69,7 @@
 
 	g_return_val_if_fail (package_id != NULL, FALSE);
 
-	glade_xml = glade_xml_new (PK_DATA "/gpk-signature.glade", NULL, NULL);
+	glade_xml = glade_xml_new (GPK_DATA "/gpk-signature.glade", NULL, NULL);
 
 	/* connect up default actions */
 	widget = glade_xml_get_widget (glade_xml, "window_gpg");

Modified: trunk/src/gpk-client-untrusted.c
==============================================================================
--- trunk/src/gpk-client-untrusted.c	(original)
+++ trunk/src/gpk-client-untrusted.c	Tue Oct  7 16:16:05 2008
@@ -67,7 +67,7 @@
 	gchar *message;
 	PolKitGnomeAction *update_system_action;
 
-	glade_xml = glade_xml_new (PK_DATA "/gpk-error.glade", NULL, NULL);
+	glade_xml = glade_xml_new (GPK_DATA "/gpk-error.glade", NULL, NULL);
 
 	/* connect up actions */
 	widget = glade_xml_get_widget (glade_xml, "window_error");

Modified: trunk/src/gpk-client.c
==============================================================================
--- trunk/src/gpk-client.c	(original)
+++ trunk/src/gpk-client.c	Tue Oct  7 16:16:05 2008
@@ -3234,7 +3234,7 @@
 
 	/* add application specific icons to search path */
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-					   PK_DATA G_DIR_SEPARATOR_S "icons");
+					   GPK_DATA G_DIR_SEPARATOR_S "icons");
 
 	gclient->priv->vendor = gpk_vendor_new ();
 	gclient->priv->dialog = gpk_client_dialog_new ();

Modified: trunk/src/gpk-common.h
==============================================================================
--- trunk/src/gpk-common.h	(original)
+++ trunk/src/gpk-common.h	Tue Oct  7 16:16:05 2008
@@ -53,6 +53,7 @@
 #define GPK_CONF_REPO_SHOW_DETAILS		"/apps/gnome-packagekit/repo/show_details"
 #define GPK_CONF_APPLICATION_FILTER_BASENAME	"/apps/gnome-packagekit/application/filter_basename"
 #define GPK_CONF_APPLICATION_FILTER_NEWEST	"/apps/gnome-packagekit/application/filter_newest"
+#define GPK_CONF_APPLICATION_CATEGORY_GROUPS	"/apps/gnome-packagekit/application/category_groups"
 #define GPK_CONF_UPDATE_VIEWER_PRECACHE_DETAILS	"/apps/gnome-packagekit/update_viewer/precache_details"
 
 #define GPK_CONF_ENABLE_FONT_HELPER		"/apps/gnome-packagekit/enable_font_helper"

Modified: trunk/src/gpk-error.c
==============================================================================
--- trunk/src/gpk-error.c	(original)
+++ trunk/src/gpk-error.c	Tue Oct  7 16:16:05 2008
@@ -54,7 +54,7 @@
 	g_return_val_if_fail (title != NULL, FALSE);
 	g_return_val_if_fail (message != NULL, FALSE);
 
-	glade_xml = glade_xml_new (PK_DATA "/gpk-error.glade", NULL, NULL);
+	glade_xml = glade_xml_new (GPK_DATA "/gpk-error.glade", NULL, NULL);
 
 	/* connect up actions */
 	widget = glade_xml_get_widget (glade_xml, "window_error");

Modified: trunk/src/gpk-log.c
==============================================================================
--- trunk/src/gpk-log.c	(original)
+++ trunk/src/gpk-log.c	Tue Oct  7 16:16:05 2008
@@ -390,7 +390,7 @@
 
 	/* add application specific icons to search path */
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-                                           PK_DATA G_DIR_SEPARATOR_S "icons");
+					   GPK_DATA G_DIR_SEPARATOR_S "icons");
 
 	/* we have to do this before we connect up the glade file */
 	gpk_update_viewer_setup_policykit ();
@@ -407,7 +407,7 @@
 	roles = pk_control_get_actions (control, NULL);
 	g_object_unref (control);
 
-	glade_xml = glade_xml_new (PK_DATA "/gpk-log.glade", NULL, NULL);
+	glade_xml = glade_xml_new (GPK_DATA "/gpk-log.glade", NULL, NULL);
 	widget = glade_xml_get_widget (glade_xml, "window_simple");
 	gtk_window_set_icon_name (GTK_WINDOW (widget), GPK_ICON_SOFTWARE_LOG);
 	gtk_widget_set_size_request (widget, 500, 400);

Modified: trunk/src/gpk-prefs.c
==============================================================================
--- trunk/src/gpk-prefs.c	(original)
+++ trunk/src/gpk-prefs.c	Tue Oct  7 16:16:05 2008
@@ -398,7 +398,7 @@
 	roles = pk_control_get_actions (control, NULL);
 	g_object_unref (control);
 
-	glade_xml = glade_xml_new (PK_DATA "/gpk-prefs.glade", NULL, NULL);
+	glade_xml = glade_xml_new (GPK_DATA "/gpk-prefs.glade", NULL, NULL);
 	main_window = glade_xml_get_widget (glade_xml, "window_prefs");
 
 	/* Hide window first so that the dialogue resizes itself without redrawing */

Modified: trunk/src/gpk-repo.c
==============================================================================
--- trunk/src/gpk-repo.c	(original)
+++ trunk/src/gpk-repo.c	Tue Oct  7 16:16:05 2008
@@ -395,7 +395,7 @@
 	/* use custom widgets */
 	glade_set_custom_handler (gpk_repo_create_custom_widget, NULL);
 
-	glade_xml = glade_xml_new (PK_DATA "/gpk-repo.glade", NULL, NULL);
+	glade_xml = glade_xml_new (GPK_DATA "/gpk-repo.glade", NULL, NULL);
 	main_window = glade_xml_get_widget (glade_xml, "window_repo");
 	gtk_window_set_icon_name (GTK_WINDOW (main_window), GPK_ICON_SOFTWARE_SOURCES);
 

Modified: trunk/src/gpk-update-icon.c
==============================================================================
--- trunk/src/gpk-update-icon.c	(original)
+++ trunk/src/gpk-update-icon.c	Tue Oct  7 16:16:05 2008
@@ -168,7 +168,7 @@
 
 	/* add application specific icons to search path */
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-                                           PK_DATA G_DIR_SEPARATOR_S "icons");
+					   GPK_DATA G_DIR_SEPARATOR_S "icons");
 
 	/* create new objects */
 	dbus = gpk_dbus_new ();

Modified: trunk/src/gpk-update-viewer.c
==============================================================================
--- trunk/src/gpk-update-viewer.c	(original)
+++ trunk/src/gpk-update-viewer.c	Tue Oct  7 16:16:05 2008
@@ -1842,7 +1842,7 @@
 
 	/* add application specific icons to search path */
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-					   PK_DATA G_DIR_SEPARATOR_S "icons");
+					   GPK_DATA G_DIR_SEPARATOR_S "icons");
 
 	/* are we already activated? */
 	egg_unique = egg_unique_new ();
@@ -1901,7 +1901,7 @@
 	/* use custom widgets */
 	glade_set_custom_handler (gpk_update_viewer_create_custom_widget, NULL);
 
-	glade_xml = glade_xml_new (PK_DATA "/gpk-update-viewer.glade", NULL, NULL);
+	glade_xml = glade_xml_new (GPK_DATA "/gpk-update-viewer.glade", NULL, NULL);
 	main_window = glade_xml_get_widget (glade_xml, "window_updates");
 
 	/* make GpkClient windows modal */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]