gnome-packagekit r148 - in trunk: . data help/C po src
- From: rhughes svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-packagekit r148 - in trunk: . data help/C po src
- Date: Tue, 1 Apr 2008 23:21:48 +0100 (BST)
Author: rhughes
Date: Tue Apr 1 23:21:47 2008
New Revision: 148
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=148&view=rev
Log:
from git
Modified:
trunk/configure.ac
trunk/data/gnome-packagekit.schemas.in
trunk/data/gpk-application.glade
trunk/data/gpk-log.desktop.in
trunk/data/gpk-progress.glade
trunk/data/gpk-update-viewer.glade
trunk/help/C/gnome-packagekit.xml
trunk/po/Makefile.in.in
trunk/src/gpk-application-main.c
trunk/src/gpk-application.c
trunk/src/gpk-application.h
trunk/src/gpk-auto-refresh.c
trunk/src/gpk-auto-refresh.h
trunk/src/gpk-backend-status.c
trunk/src/gpk-cell-renderer-uri.c
trunk/src/gpk-cell-renderer-uri.h
trunk/src/gpk-common.c
trunk/src/gpk-common.h
trunk/src/gpk-inhibit.c
trunk/src/gpk-inhibit.h
trunk/src/gpk-install-file.c
trunk/src/gpk-install-package.c
trunk/src/gpk-log.c
trunk/src/gpk-notify.c
trunk/src/gpk-prefs.c
trunk/src/gpk-progress.c
trunk/src/gpk-progress.h
trunk/src/gpk-repo.c
trunk/src/gpk-statusbar.c
trunk/src/gpk-statusbar.h
trunk/src/gpk-update-viewer.c
trunk/src/gpk-watch.c
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Apr 1 23:21:47 2008
@@ -20,7 +20,7 @@
dnl ---------------------------------------------------------------------------
if test "$GCC" = "yes"; then
CPPFLAGS="$CPPFLAGS -Werror -Wcast-align -Wno-uninitialized"
- CPPFLAGS="$CPPFLAGS -Wall"
+ CPPFLAGS="$CPPFLAGS -Wall -Wformat-security"
fi
dnl ---------------------------------------------------------------------------
Modified: trunk/data/gnome-packagekit.schemas.in
==============================================================================
--- trunk/data/gnome-packagekit.schemas.in (original)
+++ trunk/data/gnome-packagekit.schemas.in Tue Apr 1 23:21:47 2008
@@ -32,8 +32,8 @@
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>Notify the user when we have started a transaction</short>
- <long>Notify the user when we have started a transaction</long>
+ <short>Notify the user when we have started a task</short>
+ <long>Notify the user when we have started a task</long>
</locale>
</schema>
@@ -68,8 +68,8 @@
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>Notify the user when the transaction is complete</short>
- <long>Notify the user when the transaction is complete</long>
+ <short>Notify the user when the task is complete</short>
+ <long>Notify the user when the task is complete</long>
</locale>
</schema>
@@ -169,6 +169,30 @@
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/gnome-packagekit/application/filter_basename</key>
+ <applyto>/apps/gnome-packagekit/application/filter_basename</applyto>
+ <owner>gnome-packagekit</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>If we should filter using basename in gpk-application</short>
+ <long>If we should filter package lists using basename in gpk-application</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnome-packagekit/application/filter_newest</key>
+ <applyto>/apps/gnome-packagekit/application/filter_newest</applyto>
+ <owner>gnome-packagekit</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>If we should filter using newest in gpk-application</short>
+ <long>If we should filter package lists using newest in gpk-application</long>
+ </locale>
+ </schema>
+
</schemalist>
</gconfschemafile>
Modified: trunk/data/gpk-application.glade
==============================================================================
--- trunk/data/gpk-application.glade (original)
+++ trunk/data/gpk-application.glade Tue Apr 1 23:21:47 2008
@@ -251,7 +251,7 @@
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip" translatable="yes">Only show one package, not subpackages</property>
- <property name="label" translatable="yes">_Main packages</property>
+ <property name="label" translatable="yes">_Package groups</property>
<property name="use_underline">True</property>
<property name="active">True</property>
</widget>
@@ -688,6 +688,53 @@
<placeholder/>
</child>
<child>
+ <widget class="GtkButton" id="button_cancel2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-error</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_button_cancel2">
+ <property name="visible">True</property>
+ <property name="label">_Cancel</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkButton" id="button_homepage">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -731,7 +778,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
Modified: trunk/data/gpk-log.desktop.in
==============================================================================
--- trunk/data/gpk-log.desktop.in (original)
+++ trunk/data/gpk-log.desktop.in Tue Apr 1 23:21:47 2008
@@ -1,10 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
-_Name=Software Transaction Viewer
-_GenericName=Software Transaction Viewer
-_Comment=Show details for software transactions
+_Name=Software Log Viewer
+_GenericName=Software Log Viewer
+_Comment=Log viewer showing past package management tasks
Icon=edit-paste
-Exec=gpk-transaction-viewer
+Exec=gpk-log
Terminal=false
Type=Application
Categories=GNOME;GTK;System;X-Red-Hat-Base;
Modified: trunk/data/gpk-progress.glade
==============================================================================
--- trunk/data/gpk-progress.glade (original)
+++ trunk/data/gpk-progress.glade Tue Apr 1 23:21:47 2008
@@ -43,7 +43,7 @@
<widget class="GtkLabel" id="label_percentage">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Transaction Progress:</property>
+ <property name="label" translatable="yes">Task Progress:</property>
</widget>
<packing>
<property name="expand">False</property>
Modified: trunk/data/gpk-update-viewer.glade
==============================================================================
--- trunk/data/gpk-update-viewer.glade (original)
+++ trunk/data/gpk-update-viewer.glade Tue Apr 1 23:21:47 2008
@@ -69,40 +69,50 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_last_update">
+ <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Unknown....</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkButton" id="button_history">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">View History</property>
+ <property name="response_id">0</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_last_refresh">
+ <widget class="GtkAlignment" id="alignment_refresh">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Unknown....</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Last update:</property>
+ <property name="label" translatable="yes">Last refresh:</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
@@ -110,48 +120,38 @@
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Last refresh:</property>
+ <property name="label" translatable="yes">Last update:</property>
</widget>
<packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment_refresh">
+ <widget class="GtkLabel" id="label_last_refresh">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <placeholder/>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Unknown....</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkLabel" id="label_last_update">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkButton" id="button_history">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="yes">View History</property>
- <property name="response_id">0</property>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Unknown....</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
@@ -168,6 +168,7 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="button_help">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="label">gtk-help</property>
@@ -340,6 +341,7 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="button_help2">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="label">gtk-help</property>
Modified: trunk/help/C/gnome-packagekit.xml
==============================================================================
--- trunk/help/C/gnome-packagekit.xml (original)
+++ trunk/help/C/gnome-packagekit.xml Tue Apr 1 23:21:47 2008
@@ -140,6 +140,16 @@
software applications can take advantage of.
It is not a replacement for existing package managers like yum.
</para>
+ <para>
+ Some of the architectural advantages of PackageKit over other package
+ management solutions are that the PackageKit daemon runs as a system
+ process that is not tied to any user session, which means that a
+ long-running update or installation will not be interrupted if the user
+ who started it logs out. Tasks are queued up, meaning that multiple users
+ can use PackageKit in parallel without completely locking each other out.
+ Finally, access to all privileged operations is controlled via
+ <ulink url="http://en.wikipedia.org/wiki/PolicyKit";>PolicyKit</ulink>.
+ </para>
</section>
@@ -147,7 +157,8 @@
<title>Applications</title>
<para>
<application>packagekitd</application> is started automatically when it is
- needed.
+ needed. <command>pkcon</command> offers a versatile commandline interface
+ to PackageKit.
</para>
<para>
Below is a list containing the names and a short description of the
@@ -184,7 +195,13 @@
</listitem>
<listitem>
<para>
- <command>pk-backend-status</command>: Shows technical status of
+ <command>gpk-install-file</command>: Installs locally available
+ packages. This also gets run if you double-click on a package in your desktop or within a file manager.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <command>gpk-backend-status</command>: Shows technical status of
support for the underlying package management backend.
Only useful for developers.
</para>
@@ -202,8 +219,8 @@
install or remove from your system.
You can find more information about any package such as description and
dependencies by just clicking on it.
- Before installing a package, you also can visit the home page of the software
- projects easily for getting any additional details
+ Before installing a package, you also can visit the home page of the
+ software projects easily for getting any additional details.
</para>
<para>
Typically, you can find several thousands of software packages under
@@ -212,32 +229,142 @@
packages based on several criteria such as whether the package is already
installed, whether it is a development or graphical application and based
on the software license.
+ See <xref linkend="filters"/> for more information about filters.
</para>
<para>
- A software source configuration is available in the system menu that allows
- you to enable or disable a existing software repository.
- You can also refresh the application lists for displaying the latest information.
+ A software source configuration is available in the system menu that
+ allows you to enable or disable a existing software repository.
+ You can also refresh the application lists for displaying the latest
+ information.
</para>
+
+ <section id="filters">
+ <title>Filters</title>
+ <para>
+ You can limit the amount of packages that is shown by serveral criteria.
+ </para>
+ <para>
+ To see only installed or only uninstalled packages, choose the
+ corresponding menuitem in the <menuchoice><guimenu>Filters</guimenu><guisubmenu>Installed</guisubmenu></menuchoice> menu.
+ </para>
+ <para>
+ To see only packages that are required for developing software or only
+ packages that are not for that purpose, choose a filter from
+ the <menuchoice><guimenu>Filters</guimenu><guisubmenu>Development</guisubmenu></menuchoice>
+ menu. Typical packages in this category are compilers, programming
+ languages or libraries.
+ </para>
+ <para>
+ To see only packages containing applications with a graphical user
+ interface or only applications with a commandline interface, choose a
+ filter from the <menuchoice><guimenu>Filters</guimenu><guisubmenu>Graphical</guisubmenu></menuchoice>
+ menu.
+ </para>
+ <para>
+ To see only packages that qualify as free software, choose the
+ corresponding menuitem from the <menuchoice><guimenu>Filters</guimenu><guisubmenu>Free</guisubmenu></menuchoice>
+ menu. Currently, PackageKit considers a package to be free software
+ if its license is listed in the Fedora
+ <ulink url="http://fedoraproject.org/wiki/Licensing";>Licensing</ulink> page.
+ </para>
+ </section>
+
+ <section id="searching">
+ <title>Searching for software</title>
+ <para>
+ The search entry and <guibutton>Find</guibutton> button let you search
+ for software packages. The icon inside the entry indicates what kind
+ of search is performed. By clicking on it, you can select to search for
+ a string thats contained in package name, the package description, or
+ search for the name of a file contained in the package.
+ </para>
+ </section>
+
</section>
<section id="software-sources">
<title>Software Sources</title>
<para>
- A software repository viewer allows you to enable or disable sources.
+ The software repository viewer allows you to enable or disable software
+ sources ‐ also known as <quote>repositories</quote>. Repositories
+ are collections of software packages that are known to work together and
+ are compatible with your operating system. Apart from the repositories for
+ the operating system itself, there are third-party repositories offering
+ additional software for many Linux distributions ‐ check your
+ distribution-specific documentation.
+ </para>
+ <para>
+ At this time, PackageKit does not offer a way to add new repositories
+ to your system. It only allows you to enable or disable known repositories.
+ However, it is often possible to make a new repository known to PackageKit
+ by installing a package with the necessary information.
</para>
</section>
<section id="update-viewer">
<title>Update Viewer</title>
<para>
- You can update your system via <menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Update System</guimenuitem></menuchoice>.
- When you click on this, the application launches and immediately starts
- checking for updates.
- If you launched the application a while back, you can choose to manually
- refresh and verify the presence of updates.
- There is a option to view the history of updates including
- previous installations, removal or updates of software.
- </para>
+ You can update your system via <menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Update System</guimenuitem></menuchoice>
+ or by selecting <menuchoice><guimenuitem>Show Updates</guimenuitem></menuchoice>
+ from the update icon in the notification area.
+ When you do this, the update viewer application launches and immediately
+ starts checking for updates. Once this check completes, it shows you an
+ overview of available updates, grouped by severity. The severities range
+ from security updates over important updates to bug fix updates and
+ finally enhancements.
+ </para>
+ <note><para>
+ Note that the severity information must be provided by the software
+ repositories where the packages originate. This information may not
+ be available for development branches of distributions.
+ </para></note>
+ <para>
+ Below the summary of available updates, the update viewer gives and
+ indication how long ago the last check (or <quote>refresh</quote>)
+ for new updates happened, and when updates where last installed.
+ </para>
+ <para>
+ You can choose to manually refresh and verify the presence of
+ updates by clicking the <guibutton>Refresh</guibutton> button.
+ </para>
+ <tip><para>
+ You can change how often PackageKit refreshes on its own in
+ the <link linkend="prefs">Software Update Preferences</link>.
+ </para></tip>
+ <para>
+ There is a option to view the history of updates including
+ previous installations, removal or updates of software.
+ </para>
+ <para>
+ Use the <guibutton>Update System</guibutton> button to install
+ all available updates or use the <guibutton>Review</guibutton>
+ button to review and select individual updates.
+ If you do not want to install updates at this time, you can just
+ close the window.
+ </para>
+
+ <section id="update-viewer-details">
+ <title>Detailed information about updates</title>
+ <para>
+ The <guibutton>Review</guibutton> button brings up a listing
+ of the individual updates that are available. The area below
+ the list displays detailed information about the selected update.
+ The information may include references to bugs and vulnerability
+ reports that are fixed by the update.
+ </para>
+ <note><para>
+ Note that the detailed update information must be provided by the
+ software repositories where the packages originate. This information
+ may not be available for development branches of distributions.
+ </para></note>
+ <para>
+ The checkboxes next to each package in the list allow to select
+ individual updates for installation. Use the <guibutton>Apply
+ Updates</guibutton> button to install only the selected updates.
+ If you do not want to install updates at this time, you can just
+ close the window.
+ </para>
+ </section>
</section>
<section id="prefs">
@@ -251,6 +378,23 @@
</para>
</section>
+<section id="update-icon">
+ <title>Update Icon</title>
+ <para>
+ When PackageKit is installed, it starts the <command>gpk-update-icon</command>
+ command when you log in. This application displays an icon in the
+ notification area of your panel when software updates are available,
+ and is reponsible for showing notifications about PackageKit operations
+ and events.
+ </para>
+ <para>
+ The icon offers menuitems for installing the available updates or
+ for starting the update viewer, which allows you to obtain detailed
+ information about the available updates before installing them. See
+ <xref linkend="update-viewer"/> for more information.
+ </para>
+</section>
+
<section id="about">
<title>About</title>
<para>
Modified: trunk/po/Makefile.in.in
==============================================================================
--- trunk/po/Makefile.in.in (original)
+++ trunk/po/Makefile.in.in Tue Apr 1 23:21:47 2008
@@ -1,10 +1,10 @@
# Makefile for program source directory in GNU NLS utilities package.
# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper gnu ai mit edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey pwns gmail com>
#
-# This file file be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
+# This file may be copied and used freely without restrictions. It may
+# be used in projects which are not available under a GNU Public License,
# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
#
# - Modified by Owen Taylor <otaylor redhat com> to use GETTEXT_PACKAGE
# instead of PACKAGE and to look for po2tbl in ./ not in intl/
@@ -12,7 +12,7 @@
# - Modified by jacob berkman <jacob ximian com> to install
# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
#
-# - Modified by Rodney Dawes <dobey novell com> for use with intltool
+# - Modified by Rodney Dawes <dobey pwns gmail com> for use with intltool
#
# We have the following line for use by intltoolize:
# INTLTOOL_MAKEFILE
Modified: trunk/src/gpk-application-main.c
==============================================================================
--- trunk/src/gpk-application-main.c (original)
+++ trunk/src/gpk-application-main.c Tue Apr 1 23:21:47 2008
@@ -35,13 +35,13 @@
#include "gpk-application.h"
/**
- * pk_application_close_cb
+ * gpk_application_close_cb
* @application: This application class instance
*
* What to do when we are asked to close for whatever reason
**/
static void
-pk_application_close_cb (PkApplication *application)
+gpk_application_close_cb (GpkApplication *application)
{
g_object_unref (application);
exit (0);
@@ -56,7 +56,7 @@
GMainLoop *loop;
gboolean verbose = FALSE;
gboolean program_version = FALSE;
- PkApplication *application = NULL;
+ GpkApplication *application = NULL;
GOptionContext *context;
const GOptionEntry options[] = {
@@ -94,9 +94,9 @@
gtk_init (&argc, &argv);
/* create a new application object */
- application = pk_application_new ();
+ application = gpk_application_new ();
g_signal_connect (application, "action-close",
- G_CALLBACK (pk_application_close_cb), NULL);
+ G_CALLBACK (gpk_application_close_cb), NULL);
loop = g_main_loop_new (NULL, FALSE);
g_main_loop_run (loop);
Modified: trunk/src/gpk-application.c
==============================================================================
--- trunk/src/gpk-application.c (original)
+++ trunk/src/gpk-application.c Tue Apr 1 23:21:47 2008
@@ -47,11 +47,11 @@
#include "gpk-common.h"
#include "gpk-application.h"
-static void pk_application_class_init (PkApplicationClass *klass);
-static void pk_application_init (PkApplication *application);
-static void pk_application_finalize (GObject *object);
+static void gpk_application_class_init (GpkApplicationClass *klass);
+static void gpk_application_init (GpkApplication *application);
+static void gpk_application_finalize (GObject *object);
-#define PK_APPLICATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PK_TYPE_APPLICATION, PkApplicationPrivate))
+#define GPK_APPLICATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPK_TYPE_APPLICATION, GpkApplicationPrivate))
#define PK_STOCK_APP_ICON "system-software-installer"
typedef enum {
@@ -61,7 +61,7 @@
PK_SEARCH_UNKNOWN
} PkSearchType;
-struct PkApplicationPrivate
+struct GpkApplicationPrivate
{
GladeXML *glade_xml;
GConfClient *gconf_client;
@@ -72,7 +72,7 @@
PkClient *client_description;
PkClient *client_files;
PkConnection *pconnection;
- PkStatusbar *statusbar;
+ GpkStatusbar *statusbar;
PkExtra *extra;
gchar *package;
gchar *url;
@@ -111,24 +111,24 @@
static guint signals [LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (PkApplication, pk_application, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GpkApplication, gpk_application, G_TYPE_OBJECT)
/**
- * pk_application_class_init:
+ * gpk_application_class_init:
* @klass: This graph class instance
**/
static void
-pk_application_class_init (PkApplicationClass *klass)
+gpk_application_class_init (GpkApplicationClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = pk_application_finalize;
- g_type_class_add_private (klass, sizeof (PkApplicationPrivate));
+ object_class->finalize = gpk_application_finalize;
+ g_type_class_add_private (klass, sizeof (GpkApplicationPrivate));
signals [ACTION_CLOSE] =
g_signal_new ("action-close",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (PkApplicationClass, action_close),
+ G_STRUCT_OFFSET (GpkApplicationClass, action_close),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
@@ -136,10 +136,10 @@
}
/**
- * pk_application_error_message:
+ * gpk_application_error_message:
**/
static void
-pk_application_error_message (PkApplication *application, const gchar *title, const gchar *details)
+gpk_application_error_message (GpkApplication *application, const gchar *title, const gchar *details)
{
GtkWidget *main_window;
GtkWidget *dialog;
@@ -152,7 +152,7 @@
main_window = glade_xml_get_widget (application->priv->glade_xml, "window_manager");
dialog = gtk_message_dialog_new (GTK_WINDOW (main_window), GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, title);
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", title);
/* we need to be careful of markup */
if (details != NULL) {
@@ -165,17 +165,17 @@
}
/**
- * pk_application_install_cb:
+ * gpk_application_install:
**/
-static void
-pk_application_install_cb (PolKitGnomeAction *action,
- PkApplication *application)
+static gboolean
+gpk_application_install (GpkApplication *application, const gchar *package_id)
{
gboolean ret;
GError *error = NULL;
- g_return_if_fail (application != NULL);
- g_return_if_fail (PK_IS_APPLICATION (application));
+ g_return_val_if_fail (application != NULL, FALSE);
+ g_return_val_if_fail (PK_IS_APPLICATION (application), FALSE);
+ g_return_val_if_fail (package_id != NULL, FALSE);
pk_debug ("install %s", application->priv->package);
@@ -183,7 +183,7 @@
if (!ret) {
pk_warning ("failed to reset client: %s", error->message);
g_error_free (error);
- return;
+ return FALSE;
}
/* do the install */
@@ -192,37 +192,63 @@
if (!ret) {
pk_warning ("failed to install package: %s", error->message);
/* ick, we failed so pretend we didn't do the action */
- pk_application_error_message (application, _("The package could not be installed"), error->message);
+ gpk_application_error_message (application, _("The package could not be installed"), error->message);
g_error_free (error);
}
+ return ret;
+}
+
+/**
+ * gpk_application_install_cb:
+ **/
+static void
+gpk_application_install_cb (PolKitGnomeAction *action, GpkApplication *application)
+{
+ GtkWidget *widget;
+
+ g_return_if_fail (application != NULL);
+ g_return_if_fail (PK_IS_APPLICATION (application));
+
+ /* hide and show the right things */
+ polkit_gnome_action_set_visible (application->priv->install_action, FALSE);
+ widget = glade_xml_get_widget (application->priv->glade_xml, "button_cancel2");
+ gtk_widget_show (widget);
+
+ gpk_application_install (application, application->priv->package);
}
/**
- * pk_application_homepage_cb:
+ * gpk_application_homepage_cb:
**/
static void
-pk_application_homepage_cb (GtkWidget *widget,
- PkApplication *application)
+gpk_application_homepage_cb (GtkWidget *widget,
+ GpkApplication *application)
{
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
- pk_execute_url (application->priv->url);
+ gpk_execute_url (application->priv->url);
}
/**
- * pk_application_remove_only:
+ * gpk_application_remove_only:
**/
static gboolean
-pk_application_remove_only (PkApplication *application, gboolean force)
+gpk_application_remove_only (GpkApplication *application, gboolean force)
{
gboolean ret;
GError *error = NULL;
+ GtkWidget *widget;
g_return_val_if_fail (application != NULL, FALSE);
g_return_val_if_fail (PK_IS_APPLICATION (application), FALSE);
pk_debug ("remove %s", application->priv->package);
+ /* hide and show the right things */
+ polkit_gnome_action_set_visible (application->priv->remove_action, FALSE);
+ widget = glade_xml_get_widget (application->priv->glade_xml, "button_cancel2");
+ gtk_widget_show (widget);
+
ret = pk_client_reset (application->priv->client_action, &error);
if (!ret) {
pk_warning ("failed to reset client: %s", error->message);
@@ -236,7 +262,7 @@
if (!ret) {
pk_warning ("failed to reset client: %s", error->message);
/* ick, we failed so pretend we didn't do the action */
- pk_application_error_message (application,
+ gpk_application_error_message (application,
_("The package could not be removed"), error->message);
g_error_free (error);
}
@@ -244,10 +270,10 @@
}
/**
- * pk_application_requires_dialog_cb:
+ * gpk_application_requires_dialog_cb:
**/
static void
-pk_application_requires_dialog_cb (GtkDialog *dialog, gint id, PkApplication *application)
+gpk_application_requires_dialog_cb (GtkDialog *dialog, gint id, GpkApplication *application)
{
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
@@ -256,17 +282,17 @@
pk_debug ("the user clicked no");
} else if (id == -8) {
pk_debug ("the user clicked yes, remove with deps");
- pk_application_remove_only (application, TRUE);
+ gpk_application_remove_only (application, TRUE);
} else {
pk_warning ("id unknown=%i", id);
}
}
/**
- * pk_application_requires_finished_cb:
+ * gpk_application_requires_finished_cb:
**/
static void
-pk_application_requires_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, PkApplication *application)
+gpk_application_requires_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, GpkApplication *application)
{
guint length;
gchar *title;
@@ -287,16 +313,17 @@
/* if there are no required packages, just do the remove */
if (length == 0) {
pk_debug ("no requires");
- pk_application_remove_only (application, FALSE);
+ gpk_application_remove_only (application, FALSE);
g_object_unref (client);
return;
}
/* present this to the user */
- text = g_string_new (_("The following packages have to be removed:\n\n"));
+ text = g_string_new (_("The following packages have to be removed:"));
+ g_string_append (text, "\n\n");
for (i=0; i<length; i++) {
item = pk_client_package_buffer_get_item (client, i);
- message = pk_package_id_pretty_oneline (item->package_id, item->summary);
+ message = gpk_package_id_pretty_oneline (item->package_id, item->summary);
g_string_append_printf (text, "%s\n", message);
g_free (message);
}
@@ -306,16 +333,16 @@
/* display messagebox */
message = g_string_free (text, FALSE);
- package_name = pk_package_get_name (application->priv->package);
+ package_name = gpk_package_get_name (application->priv->package);
title = g_strdup_printf (_("Other software depends on %s"), package_name);
g_free (package_name);
main_window = glade_xml_get_widget (application->priv->glade_xml, "window_manager");
dialog = gtk_message_dialog_new (GTK_WINDOW (main_window), GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, title);
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, "%s", title);
gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("Remove all packages"), -8, NULL);
gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", message);
- g_signal_connect (dialog, "response", G_CALLBACK (pk_application_requires_dialog_cb), application);
+ g_signal_connect (dialog, "response", G_CALLBACK (gpk_application_requires_dialog_cb), application);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (GTK_WIDGET (dialog));
g_free (message);
@@ -323,11 +350,11 @@
}
/**
- * pk_application_remove_cb:
+ * gpk_application_remove_cb:
**/
static void
-pk_application_remove_cb (PolKitGnomeAction *action,
- PkApplication *application)
+gpk_application_remove_cb (PolKitGnomeAction *action,
+ GpkApplication *application)
{
gboolean ret;
PkClient *client;
@@ -339,7 +366,7 @@
/* are we dumb and can't check for requires? */
if (pk_enum_list_contains (application->priv->role_list, PK_ROLE_ENUM_GET_REQUIRES) == FALSE) {
/* no, just try to remove it without deps */
- pk_application_remove_only (application, FALSE);
+ gpk_application_remove_only (application, FALSE);
return;
}
@@ -347,7 +374,7 @@
client = pk_client_new ();
pk_client_set_use_buffer (client, TRUE, NULL);
g_signal_connect (client, "finished",
- G_CALLBACK (pk_application_requires_finished_cb), application);
+ G_CALLBACK (gpk_application_requires_finished_cb), application);
/* do the requires */
pk_debug ("getting requires for %s", application->priv->package);
@@ -359,10 +386,10 @@
}
/**
- * pk_application_set_text_buffer:
+ * gpk_application_set_text_buffer:
**/
static void
-pk_application_set_text_buffer (GtkWidget *widget, const gchar *text)
+gpk_application_set_text_buffer (GtkWidget *widget, const gchar *text)
{
GtkTextBuffer *buffer;
buffer = gtk_text_buffer_new (NULL);
@@ -377,13 +404,13 @@
}
/**
- * pk_application_description_cb:
+ * gpk_application_description_cb:
**/
static void
-pk_application_description_cb (PkClient *client, const gchar *package_id,
+gpk_application_description_cb (PkClient *client, const gchar *package_id,
const gchar *license, PkGroupEnum group,
const gchar *detail, const gchar *url,
- guint64 size, PkApplication *application)
+ guint64 size, GpkApplication *application)
{
GtkWidget *widget;
gchar *text;
@@ -409,7 +436,7 @@
/* set the description */
text = g_markup_escape_text (detail, -1);
widget = glade_xml_get_widget (application->priv->glade_xml, "textview_description");
- pk_application_set_text_buffer (widget, text);
+ gpk_application_set_text_buffer (widget, text);
g_free (text);
/* if non-zero, set the size */
@@ -418,7 +445,7 @@
widget = glade_xml_get_widget (application->priv->glade_xml, "hbox_filesize");
gtk_widget_show (widget);
widget = glade_xml_get_widget (application->priv->glade_xml, "label_filesize");
- value = pk_size_to_si_size_text (size);
+ value = gpk_size_to_si_size_text (size);
gtk_label_set_label (GTK_LABEL (widget), value);
g_free (value);
} else {
@@ -428,11 +455,11 @@
}
/**
- * pk_application_files_cb:
+ * gpk_application_files_cb:
**/
static void
-pk_application_files_cb (PkClient *client, const gchar *package_id,
- const gchar *filelist, PkApplication *application)
+gpk_application_files_cb (PkClient *client, const gchar *package_id,
+ const gchar *filelist, GpkApplication *application)
{
GtkWidget *widget;
@@ -453,21 +480,21 @@
list = g_strjoinv ("\n", array);
/* apply the list */
- pk_application_set_text_buffer (widget, list);
+ gpk_application_set_text_buffer (widget, list);
g_strfreev (array);
g_free (list);
} else {
/* no information */
- pk_application_set_text_buffer (widget, _("No files"));
+ gpk_application_set_text_buffer (widget, _("No files"));
}
}
/**
- * pk_application_package_cb:
+ * gpk_application_package_cb:
**/
static void
-pk_application_package_cb (PkClient *client, PkInfoEnum info, const gchar *package_id,
- const gchar *summary, PkApplication *application)
+gpk_application_package_cb (PkClient *client, PkInfoEnum info, const gchar *package_id,
+ const gchar *summary, GpkApplication *application)
{
GtkTreeIter iter;
PkExtraObj *eobj;
@@ -491,12 +518,12 @@
eobj = pk_extra_obj_new_from_package_id_summary (package_id, summary);
/* check icon actually exists and is valid in this theme */
- valid = pk_icon_valid (eobj->icon);
+ valid = gpk_icon_valid (eobj->icon);
/* nothing in the detail database or invalid */
if (valid == FALSE) {
g_free (eobj->icon);
- eobj->icon = g_strdup (pk_info_enum_to_icon_name (info));
+ eobj->icon = g_strdup (gpk_info_enum_to_icon_name (info));
}
text = g_markup_printf_escaped ("<b>%s-%s (%s)</b>\n%s", eobj->id->name,
@@ -515,10 +542,10 @@
}
/**
- * pk_application_error_code_cb:
+ * gpk_application_error_code_cb:
**/
static void
-pk_application_error_code_cb (PkClient *client, PkErrorCodeEnum code, const gchar *details, PkApplication *application)
+gpk_application_error_code_cb (PkClient *client, PkErrorCodeEnum code, const gchar *details, GpkApplication *application)
{
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
@@ -528,15 +555,15 @@
return;
}
- pk_application_error_message (application,
- pk_error_enum_to_localised_text (code), details);
+ gpk_application_error_message (application,
+ gpk_error_enum_to_localised_text (code), details);
}
/**
- * pk_application_package_buffer_to_name_version:
+ * gpk_application_package_buffer_to_name_version:
**/
static gchar *
-pk_application_package_buffer_to_name_version (PkClient *client)
+gpk_application_package_buffer_to_name_version (PkClient *client)
{
guint i;
PkPackageItem *item;
@@ -553,7 +580,7 @@
for (i=0; i<length; i++) {
item = pk_client_package_buffer_get_item (client, i);
/* just use the name */
- text_pretty = pk_package_id_name_version (item->package_id);
+ text_pretty = gpk_package_id_name_version (item->package_id);
g_string_append_printf (string, "%s\n", text_pretty);
g_free (text_pretty);
}
@@ -562,10 +589,10 @@
}
/**
- * pk_application_refresh_search_results:
+ * gpk_application_refresh_search_results:
**/
static gboolean
-pk_application_refresh_search_results (PkApplication *application)
+gpk_application_refresh_search_results (GpkApplication *application)
{
GtkWidget *widget;
gboolean ret;
@@ -594,10 +621,10 @@
}
/**
- * pk_application_finished_cb:
+ * gpk_application_finished_cb:
**/
static void
-pk_application_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, PkApplication *application)
+gpk_application_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, GpkApplication *application)
{
GtkWidget *widget;
PkRoleEnum role;
@@ -610,14 +637,14 @@
pk_client_get_role (client, &role, NULL, NULL);
/* do we need to fill in the tab box? */
if (role == PK_ROLE_ENUM_GET_DEPENDS) {
- text = pk_application_package_buffer_to_name_version (client);
+ text = gpk_application_package_buffer_to_name_version (client);
widget = glade_xml_get_widget (application->priv->glade_xml, "textview_depends");
- pk_application_set_text_buffer (widget, text);
+ gpk_application_set_text_buffer (widget, text);
g_free (text);
} else if (role == PK_ROLE_ENUM_GET_REQUIRES) {
- text = pk_application_package_buffer_to_name_version (client);
+ text = gpk_application_package_buffer_to_name_version (client);
widget = glade_xml_get_widget (application->priv->glade_xml, "textview_requires");
- pk_application_set_text_buffer (widget, text);
+ gpk_application_set_text_buffer (widget, text);
g_free (text);
}
@@ -644,35 +671,37 @@
}
/* hide widget */
- pk_statusbar_hide (application->priv->statusbar);
+ gpk_statusbar_hide (application->priv->statusbar);
/* do we need to update the search? */
if (role == PK_ROLE_ENUM_INSTALL_PACKAGE ||
role == PK_ROLE_ENUM_REMOVE_PACKAGE) {
+ widget = glade_xml_get_widget (application->priv->glade_xml, "button_cancel2");
+ gtk_widget_hide (widget);
/* refresh the search as the items may have changed and the filter has not changed */
- pk_application_refresh_search_results (application);
+ gpk_application_refresh_search_results (application);
}
}
/**
- * pk_application_progress_changed_cb:
+ * gpk_application_progress_changed_cb:
**/
static void
-pk_application_progress_changed_cb (PkClient *client, guint percentage, guint subpercentage,
- guint elapsed, guint remaining, PkApplication *application)
+gpk_application_progress_changed_cb (PkClient *client, guint percentage, guint subpercentage,
+ guint elapsed, guint remaining, GpkApplication *application)
{
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
- pk_statusbar_set_percentage (application->priv->statusbar, percentage);
- pk_statusbar_set_remaining (application->priv->statusbar, remaining);
+ gpk_statusbar_set_percentage (application->priv->statusbar, percentage);
+ gpk_statusbar_set_remaining (application->priv->statusbar, remaining);
}
/**
- * pk_application_cancel_cb:
+ * gpk_application_cancel_cb:
**/
static void
-pk_application_cancel_cb (GtkWidget *button_widget, PkApplication *application)
+gpk_application_cancel_cb (GtkWidget *button_widget, GpkApplication *application)
{
GtkWidget *widget;
gboolean ret;
@@ -693,10 +722,10 @@
}
/**
- * pk_application_perform_search:
+ * gpk_application_perform_search:
**/
static gboolean
-pk_application_perform_search (PkApplication *application)
+gpk_application_perform_search (GpkApplication *application)
{
GtkWidget *widget;
const gchar *package;
@@ -717,7 +746,7 @@
if (!ret) {
pk_debug ("invalid input text, will fail");
/* TODO - make the dialog turn red... */
- pk_application_error_message (application, _("Invalid search text"),
+ gpk_application_error_message (application, _("Invalid search text"),
_("The search text contains invalid characters"));
return FALSE;
}
@@ -748,7 +777,7 @@
}
if (!ret) {
- pk_application_error_message (application,
+ gpk_application_error_message (application,
_("The search could not be completed"), error->message);
g_error_free (error);
return FALSE;
@@ -775,23 +804,23 @@
}
/**
- * pk_application_find_cb:
+ * gpk_application_find_cb:
**/
static void
-pk_application_find_cb (GtkWidget *button_widget, PkApplication *application)
+gpk_application_find_cb (GtkWidget *button_widget, GpkApplication *application)
{
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
- pk_application_perform_search (application);
+ gpk_application_perform_search (application);
}
/**
- * pk_application_quit:
+ * gpk_application_quit:
* @event: The event type, unused.
**/
static gboolean
-pk_application_quit (PkApplication *application)
+gpk_application_quit (GpkApplication *application)
{
gboolean ret;
GError *error = NULL;
@@ -825,23 +854,23 @@
}
/**
- * pk_application_delete_event_cb:
+ * gpk_application_delete_event_cb:
* @event: The event type, unused.
**/
static gboolean
-pk_application_delete_event_cb (GtkWidget *widget,
+gpk_application_delete_event_cb (GtkWidget *widget,
GdkEvent *event,
- PkApplication *application)
+ GpkApplication *application)
{
g_return_val_if_fail (application != NULL, FALSE);
g_return_val_if_fail (PK_IS_APPLICATION (application), FALSE);
- pk_application_quit (application);
+ gpk_application_quit (application);
return FALSE;
}
static gboolean
-pk_application_text_changed_cb (GtkEntry *entry, GdkEventKey *event, PkApplication *application)
+gpk_application_text_changed_cb (GtkEntry *entry, GdkEventKey *event, GpkApplication *application)
{
gboolean valid;
GtkWidget *widget;
@@ -922,7 +951,7 @@
**/
static void
pk_groups_treeview_clicked_cb (GtkTreeSelection *selection,
- PkApplication *application)
+ GpkApplication *application)
{
GtkTreeModel *model;
GtkTreeIter iter;
@@ -975,7 +1004,7 @@
gtk_widget_show (widget);
}
} else {
- pk_application_error_message (application,
+ gpk_application_error_message (application,
_("The group could not be queried"), error->message);
g_error_free (error);
}
@@ -986,7 +1015,7 @@
* pk_notebook_populate:
**/
static gboolean
-pk_notebook_populate (PkApplication *application, gint page)
+pk_notebook_populate (GpkApplication *application, gint page)
{
gboolean ret;
GtkWidget *widget;
@@ -1016,7 +1045,7 @@
if (potential == page) {
/* clear the old text */
widget = glade_xml_get_widget (application->priv->glade_xml, "textview_description");
- pk_application_set_text_buffer (widget, NULL);
+ gpk_application_set_text_buffer (widget, NULL);
/* hide the homepage button until we get data */
widget = glade_xml_get_widget (application->priv->glade_xml, "button_homepage");
@@ -1047,7 +1076,7 @@
if (potential == page) {
/* clear the old text */
widget = glade_xml_get_widget (application->priv->glade_xml, "textview_files");
- pk_application_set_text_buffer (widget, NULL);
+ gpk_application_set_text_buffer (widget, NULL);
/* cancel any previous request */
ret = pk_client_reset (application->priv->client_files, &error);
@@ -1074,7 +1103,7 @@
if (potential == page) {
/* clear the old text */
widget = glade_xml_get_widget (application->priv->glade_xml, "textview_depends");
- pk_application_set_text_buffer (widget, NULL);
+ gpk_application_set_text_buffer (widget, NULL);
/* cancel any previous request */
ret = pk_client_reset (application->priv->client_files, &error);
@@ -1101,7 +1130,7 @@
if (potential == page) {
/* clear the old text */
widget = glade_xml_get_widget (application->priv->glade_xml, "textview_requires");
- pk_application_set_text_buffer (widget, NULL);
+ gpk_application_set_text_buffer (widget, NULL);
/* cancel any previous request */
ret = pk_client_reset (application->priv->client_files, &error);
@@ -1125,11 +1154,11 @@
}
/**
- * pk_application_notebook_changed_cb:
+ * gpk_application_notebook_changed_cb:
**/
static void
-pk_application_notebook_changed_cb (GtkWidget *widget, gboolean arg1,
- gint page, PkApplication *application)
+gpk_application_notebook_changed_cb (GtkWidget *widget, gboolean arg1,
+ gint page, GpkApplication *application)
{
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
@@ -1142,7 +1171,7 @@
**/
static void
pk_packages_treeview_clicked_cb (GtkTreeSelection *selection,
- PkApplication *application)
+ GpkApplication *application)
{
GtkWidget *widget;
GtkTreeModel *model;
@@ -1199,7 +1228,7 @@
* pk_connection_changed_cb:
**/
static void
-pk_connection_changed_cb (PkConnection *pconnection, gboolean connected, PkApplication *application)
+pk_connection_changed_cb (PkConnection *pconnection, gboolean connected, GpkApplication *application)
{
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
@@ -1211,7 +1240,7 @@
* pk_group_add_data:
**/
static void
-pk_group_add_data (PkApplication *application, PkGroupEnum group)
+pk_group_add_data (GpkApplication *application, PkGroupEnum group)
{
GtkTreeIter iter;
const gchar *icon_name;
@@ -1219,8 +1248,8 @@
gtk_list_store_append (application->priv->groups_store, &iter);
- text = pk_group_enum_to_localised_text (group);
- icon_name = pk_group_enum_to_icon_name (group);
+ 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,
GROUPS_COLUMN_NAME, text,
GROUPS_COLUMN_ID, pk_group_enum_to_text (group),
@@ -1229,10 +1258,10 @@
}
/**
- * pk_application_create_custom_widget:
+ * gpk_application_create_custom_widget:
**/
static GtkWidget *
-pk_application_create_custom_widget (GladeXML *xml, gchar *func_name, gchar *name,
+gpk_application_create_custom_widget (GladeXML *xml, gchar *func_name, gchar *name,
gchar *string1, gchar *string2,
gint int1, gint int2, gpointer user_data)
{
@@ -1245,10 +1274,10 @@
}
/**
- * pk_application_popup_position_menu:
+ * gpk_application_popup_position_menu:
**/
static void
-pk_application_popup_position_menu (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer user_data)
+gpk_application_popup_position_menu (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer user_data)
{
GtkWidget *widget;
GtkRequisition requisition;
@@ -1268,14 +1297,14 @@
}
/**
- * pk_application_menu_search_by_name:
+ * gpk_application_menu_search_by_name:
**/
static void
-pk_application_menu_search_by_name (GtkMenuItem *item, gpointer data)
+gpk_application_menu_search_by_name (GtkMenuItem *item, gpointer data)
{
GtkWidget *icon;
GtkWidget *widget;
- PkApplication *application = PK_APPLICATION (data);
+ GpkApplication *application = GPK_APPLICATION (data);
/* change type */
application->priv->search_type = PK_SEARCH_NAME;
@@ -1289,14 +1318,14 @@
}
/**
- * pk_application_menu_search_by_description:
+ * gpk_application_menu_search_by_description:
**/
static void
-pk_application_menu_search_by_description (GtkMenuItem *item, gpointer data)
+gpk_application_menu_search_by_description (GtkMenuItem *item, gpointer data)
{
GtkWidget *icon;
GtkWidget *widget;
- PkApplication *application = PK_APPLICATION (data);
+ GpkApplication *application = GPK_APPLICATION (data);
/* set type */
application->priv->search_type = PK_SEARCH_DETAILS;
@@ -1310,14 +1339,14 @@
}
/**
- * pk_application_menu_search_by_file:
+ * gpk_application_menu_search_by_file:
**/
static void
-pk_application_menu_search_by_file (GtkMenuItem *item, gpointer data)
+gpk_application_menu_search_by_file (GtkMenuItem *item, gpointer data)
{
GtkWidget *icon;
GtkWidget *widget;
- PkApplication *application = PK_APPLICATION (data);
+ GpkApplication *application = GPK_APPLICATION (data);
/* set type */
application->priv->search_type = PK_SEARCH_FILE;
@@ -1331,15 +1360,15 @@
}
/**
- * pk_application_entry_text_icon_pressed_cb:
+ * gpk_application_entry_text_icon_pressed_cb:
**/
static void
-pk_application_entry_text_icon_pressed_cb (SexyIconEntry *entry, gint icon_pos, gint button, gpointer data)
+gpk_application_entry_text_icon_pressed_cb (SexyIconEntry *entry, gint icon_pos, gint button, gpointer data)
{
GtkMenu *menu = (GtkMenu*) gtk_menu_new ();
GtkWidget *item;
GtkWidget *image;
- PkApplication *application = PK_APPLICATION (data);
+ GpkApplication *application = GPK_APPLICATION (data);
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
@@ -1355,7 +1384,7 @@
image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
g_signal_connect (G_OBJECT (item), "activate",
- G_CALLBACK (pk_application_menu_search_by_name), application);
+ G_CALLBACK (gpk_application_menu_search_by_name), application);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
}
@@ -1364,7 +1393,7 @@
image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
g_signal_connect (G_OBJECT (item), "activate",
- G_CALLBACK (pk_application_menu_search_by_description), application);
+ G_CALLBACK (gpk_application_menu_search_by_description), application);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
}
@@ -1373,23 +1402,23 @@
image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
g_signal_connect (G_OBJECT (item), "activate",
- G_CALLBACK (pk_application_menu_search_by_file), application);
+ G_CALLBACK (gpk_application_menu_search_by_file), application);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
}
gtk_widget_show_all (GTK_WIDGET (menu));
gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
- pk_application_popup_position_menu, entry,
+ gpk_application_popup_position_menu, entry,
1, gtk_get_current_event_time());
}
/**
- * pk_application_create_completion_model:
+ * gpk_application_create_completion_model:
*
* Creates a tree model containing the completions
**/
static GtkTreeModel *
-pk_application_create_completion_model (void)
+gpk_application_create_completion_model (void)
{
GtkListStore *store;
GtkTreeIter iter;
@@ -1413,10 +1442,10 @@
/**
- * * pk_application_about_dialog_url_cb:
+ * * gpk_application_about_dialog_url_cb:
* **/
static void
-pk_application_about_dialog_url_cb (GtkAboutDialog *about, const char *address, gpointer data)
+gpk_application_about_dialog_url_cb (GtkAboutDialog *about, const char *address, gpointer data)
{
GError *error = NULL;
gboolean ret;
@@ -1465,19 +1494,19 @@
}
/**
- * pk_application_menu_help_cb:
+ * gpk_application_menu_help_cb:
**/
static void
-pk_application_menu_help_cb (GtkAction *action, PkApplication *application)
+gpk_application_menu_help_cb (GtkAction *action, GpkApplication *application)
{
- pk_show_help ("add-remove");
+ gpk_show_help ("add-remove");
}
/**
- * pk_application_menu_about_cb:
+ * gpk_application_menu_about_cb:
**/
static void
-pk_application_menu_about_cb (GtkAction *action, PkApplication *application)
+gpk_application_menu_about_cb (GtkAction *action, GpkApplication *application)
{
static gboolean been_here = FALSE;
GtkWidget *main_window;
@@ -1518,8 +1547,8 @@
if (!been_here) {
been_here = TRUE;
- gtk_about_dialog_set_url_hook (pk_application_about_dialog_url_cb, NULL, NULL);
- gtk_about_dialog_set_email_hook (pk_application_about_dialog_url_cb, "mailto:";, NULL);
+ gtk_about_dialog_set_url_hook (gpk_application_about_dialog_url_cb, NULL, NULL);
+ gtk_about_dialog_set_email_hook (gpk_application_about_dialog_url_cb, "mailto:";, NULL);
}
/* use parent */
@@ -1543,10 +1572,10 @@
}
/**
- * pk_application_menu_refresh_cb:
+ * gpk_application_menu_refresh_cb:
**/
static void
-pk_application_menu_refresh_cb (GtkAction *action, PkApplication *application)
+gpk_application_menu_refresh_cb (GtkAction *action, GpkApplication *application)
{
gboolean ret;
GError *error = NULL;
@@ -1557,7 +1586,7 @@
/* can we cancel what we are doing? */
ret = pk_client_reset (application->priv->client_action, &error);
if (!ret) {
- pk_application_error_message (application, _("Package list could not be refreshed"), error->message);
+ gpk_application_error_message (application, _("Package list could not be refreshed"), error->message);
g_error_free (error);
return;
}
@@ -1565,7 +1594,7 @@
/* try to refresh the cache */
ret = pk_client_refresh_cache (application->priv->client_action, FALSE, &error);
if (!ret) {
- pk_application_error_message (application, _("The package could not be installed"), error->message);
+ gpk_application_error_message (application, _("The package could not be installed"), error->message);
g_error_free (error);
return;
}
@@ -1573,10 +1602,10 @@
}
/**
- * pk_application_menu_sources_cb:
+ * gpk_application_menu_sources_cb:
**/
static void
-pk_application_menu_sources_cb (GtkAction *action, PkApplication *application)
+gpk_application_menu_sources_cb (GtkAction *action, GpkApplication *application)
{
gboolean ret;
@@ -1590,23 +1619,23 @@
}
/**
- * pk_application_menu_quit_cb:
+ * gpk_application_menu_quit_cb:
**/
static void
-pk_application_menu_quit_cb (GtkAction *action, PkApplication *application)
+gpk_application_menu_quit_cb (GtkAction *action, GpkApplication *application)
{
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
- pk_application_quit (application);
+ gpk_application_quit (application);
}
/**
- * pk_application_menu_filter_installed_cb:
+ * gpk_application_menu_filter_installed_cb:
* @widget: The GtkWidget object
**/
static void
-pk_application_menu_filter_installed_cb (GtkWidget *widget, PkApplication *application)
+gpk_application_menu_filter_installed_cb (GtkWidget *widget, GpkApplication *application)
{
const gchar *name;
@@ -1633,15 +1662,15 @@
}
/* refresh the search results */
- pk_application_perform_search (application);
+ gpk_application_perform_search (application);
}
/**
- * pk_application_menu_filter_devel_cb:
+ * gpk_application_menu_filter_devel_cb:
* @widget: The GtkWidget object
**/
static void
-pk_application_menu_filter_devel_cb (GtkWidget *widget, PkApplication *application)
+gpk_application_menu_filter_devel_cb (GtkWidget *widget, GpkApplication *application)
{
const gchar *name;
@@ -1668,15 +1697,15 @@
}
/* refresh the search results */
- pk_application_perform_search (application);
+ gpk_application_perform_search (application);
}
/**
- * pk_application_menu_filter_gui_cb:
+ * gpk_application_menu_filter_gui_cb:
* @widget: The GtkWidget object
**/
static void
-pk_application_menu_filter_gui_cb (GtkWidget *widget, PkApplication *application)
+gpk_application_menu_filter_gui_cb (GtkWidget *widget, GpkApplication *application)
{
const gchar *name;
@@ -1703,15 +1732,15 @@
}
/* refresh the search results */
- pk_application_perform_search (application);
+ gpk_application_perform_search (application);
}
/**
- * pk_application_menu_filter_free_cb:
+ * gpk_application_menu_filter_free_cb:
* @widget: The GtkWidget object
**/
static void
-pk_application_menu_filter_free_cb (GtkWidget *widget, PkApplication *application)
+gpk_application_menu_filter_free_cb (GtkWidget *widget, GpkApplication *application)
{
const gchar *name;
@@ -1738,67 +1767,91 @@
}
/* refresh the search results */
- pk_application_perform_search (application);
+ gpk_application_perform_search (application);
}
/**
- * pk_application_menu_filter_basename_cb:
+ * gpk_application_menu_filter_basename_cb:
* @widget: The GtkWidget object
**/
static void
-pk_application_menu_filter_basename_cb (GtkWidget *widget, PkApplication *application)
+gpk_application_menu_filter_basename_cb (GtkWidget *widget, GpkApplication *application)
{
+ gboolean enabled;
+ gchar *filter;
+
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
- /* single checkbox */
- if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) {
+ /* save users preference to gconf */
+ enabled = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
+ gconf_client_set_bool (application->priv->gconf_client,
+ GPK_CONF_APPLICATION_FILTER_BASENAME, enabled, NULL);
+
+ /* change the filter */
+ if (enabled) {
pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_BASENAME);
} else {
pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_BASENAME);
}
+ filter = pk_enum_list_to_string (application->priv->current_filter);
+ pk_debug ("filter now = %s", filter);
+ g_free (filter);
+
/* refresh the search results */
- pk_application_perform_search (application);
+ gpk_application_perform_search (application);
}
/**
- * pk_application_menu_filter_newest_cb:
+ * gpk_application_menu_filter_newest_cb:
* @widget: The GtkWidget object
**/
static void
-pk_application_menu_filter_newest_cb (GtkWidget *widget, PkApplication *application)
+gpk_application_menu_filter_newest_cb (GtkWidget *widget, GpkApplication *application)
{
+ gboolean enabled;
+ gchar *filter;
+
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
- /* single checkbox */
- if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) {
+ /* save users preference to gconf */
+ enabled = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
+ gconf_client_set_bool (application->priv->gconf_client,
+ GPK_CONF_APPLICATION_FILTER_NEWEST, enabled, NULL);
+
+ /* change the filter */
+ if (enabled) {
pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_NEWEST);
} else {
pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_NEWEST);
}
+ filter = pk_enum_list_to_string (application->priv->current_filter);
+ pk_debug ("filter now = %s", filter);
+ g_free (filter);
+
/* refresh the search results */
- pk_application_perform_search (application);
+ gpk_application_perform_search (application);
}
/**
- * pk_application_status_changed_cb:
+ * gpk_application_status_changed_cb:
**/
static void
-pk_application_status_changed_cb (PkClient *client, PkStatusEnum status, PkApplication *application)
+gpk_application_status_changed_cb (PkClient *client, PkStatusEnum status, GpkApplication *application)
{
g_return_if_fail (application != NULL);
g_return_if_fail (PK_IS_APPLICATION (application));
- pk_statusbar_set_status (application->priv->statusbar, status);
+ gpk_statusbar_set_status (application->priv->statusbar, status);
}
/**
- * pk_application_allow_cancel_cb:
+ * gpk_application_allow_cancel_cb:
**/
static void
-pk_application_allow_cancel_cb (PkClient *client, gboolean allow_cancel, PkApplication *application)
+gpk_application_allow_cancel_cb (PkClient *client, gboolean allow_cancel, GpkApplication *application)
{
GtkWidget *widget;
@@ -1807,13 +1860,50 @@
widget = glade_xml_get_widget (application->priv->glade_xml, "button_cancel");
gtk_widget_set_sensitive (widget, allow_cancel);
+ widget = glade_xml_get_widget (application->priv->glade_xml, "button_cancel2");
+ gtk_widget_set_sensitive (widget, allow_cancel);
+}
+
+/**
+ * gpk_application_package_row_activated_cb:
+ **/
+void
+gpk_application_package_row_activated_cb (GtkTreeView *treeview, GtkTreePath *path,
+ GtkTreeViewColumn *col, GpkApplication *application)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gchar *package_id = NULL;
+ gboolean installed;
+ gboolean ret;
+
+ g_return_if_fail (application != NULL);
+ g_return_if_fail (PK_IS_APPLICATION (application));
+
+ /* get selection */
+ model = gtk_tree_view_get_model (treeview);
+ ret = gtk_tree_model_get_iter (model, &iter, path);
+ if (!ret) {
+ pk_warning ("failed to get selection");
+ return;
+ }
+
+ /* get details */
+ gtk_tree_model_get (model, &iter,
+ PACKAGES_COLUMN_INSTALLED, &installed,
+ PACKAGES_COLUMN_ID, &package_id, -1);
+ if (!installed) {
+ pk_debug ("auto installing due to double click");
+ gpk_application_install (application, package_id);
+ }
+ g_free (package_id);
}
/**
- * pk_application_init:
+ * gpk_application_init:
**/
static void
-pk_application_init (PkApplication *application)
+gpk_application_init (GpkApplication *application)
{
GtkWidget *main_window;
GtkWidget *vbox;
@@ -1822,6 +1912,7 @@
GtkTreeModel *completion_model;
GtkTreeSelection *selection;
gboolean autocomplete;
+ gboolean enabled;
PkGroupEnum group;
gchar *locale; /* does not need to be freed */
guint length;
@@ -1832,7 +1923,7 @@
GtkWidget *button;
GtkWidget *item;
- application->priv = PK_APPLICATION_GET_PRIVATE (application);
+ application->priv = GPK_APPLICATION_GET_PRIVATE (application);
application->priv->package = NULL;
application->priv->url = NULL;
application->priv->has_package = FALSE;
@@ -1847,64 +1938,64 @@
PK_DATA G_DIR_SEPARATOR_S "icons");
/* use a sexy widget */
- glade_set_custom_handler (pk_application_create_custom_widget, application);
+ glade_set_custom_handler (gpk_application_create_custom_widget, application);
application->priv->client_search = pk_client_new ();
g_signal_connect (application->priv->client_search, "package",
- G_CALLBACK (pk_application_package_cb), application);
+ G_CALLBACK (gpk_application_package_cb), application);
g_signal_connect (application->priv->client_search, "error-code",
- G_CALLBACK (pk_application_error_code_cb), application);
+ G_CALLBACK (gpk_application_error_code_cb), application);
g_signal_connect (application->priv->client_search, "finished",
- G_CALLBACK (pk_application_finished_cb), application);
+ G_CALLBACK (gpk_application_finished_cb), application);
g_signal_connect (application->priv->client_search, "progress-changed",
- G_CALLBACK (pk_application_progress_changed_cb), application);
+ G_CALLBACK (gpk_application_progress_changed_cb), application);
g_signal_connect (application->priv->client_search, "status-changed",
- G_CALLBACK (pk_application_status_changed_cb), application);
+ G_CALLBACK (gpk_application_status_changed_cb), application);
g_signal_connect (application->priv->client_search, "allow-cancel",
- G_CALLBACK (pk_application_allow_cancel_cb), application);
+ G_CALLBACK (gpk_application_allow_cancel_cb), application);
application->priv->client_action = pk_client_new ();
g_signal_connect (application->priv->client_action, "package",
- G_CALLBACK (pk_application_package_cb), application);
+ G_CALLBACK (gpk_application_package_cb), application);
g_signal_connect (application->priv->client_action, "error-code",
- G_CALLBACK (pk_application_error_code_cb), application);
+ G_CALLBACK (gpk_application_error_code_cb), application);
g_signal_connect (application->priv->client_action, "finished",
- G_CALLBACK (pk_application_finished_cb), application);
+ G_CALLBACK (gpk_application_finished_cb), application);
g_signal_connect (application->priv->client_action, "progress-changed",
- G_CALLBACK (pk_application_progress_changed_cb), application);
+ G_CALLBACK (gpk_application_progress_changed_cb), application);
g_signal_connect (application->priv->client_action, "status-changed",
- G_CALLBACK (pk_application_status_changed_cb), application);
+ G_CALLBACK (gpk_application_status_changed_cb), application);
g_signal_connect (application->priv->client_action, "allow-cancel",
- G_CALLBACK (pk_application_allow_cancel_cb), application);
+ G_CALLBACK (gpk_application_allow_cancel_cb), application);
application->priv->client_description = pk_client_new ();
g_signal_connect (application->priv->client_description, "description",
- G_CALLBACK (pk_application_description_cb), application);
+ G_CALLBACK (gpk_application_description_cb), application);
g_signal_connect (application->priv->client_description, "error-code",
- G_CALLBACK (pk_application_error_code_cb), application);
+ G_CALLBACK (gpk_application_error_code_cb), application);
g_signal_connect (application->priv->client_description, "finished",
- G_CALLBACK (pk_application_finished_cb), application);
+ G_CALLBACK (gpk_application_finished_cb), application);
g_signal_connect (application->priv->client_description, "progress-changed",
- G_CALLBACK (pk_application_progress_changed_cb), application);
+ G_CALLBACK (gpk_application_progress_changed_cb), application);
g_signal_connect (application->priv->client_description, "status-changed",
- G_CALLBACK (pk_application_status_changed_cb), application);
+ G_CALLBACK (gpk_application_status_changed_cb), application);
g_signal_connect (application->priv->client_description, "allow-cancel",
- G_CALLBACK (pk_application_allow_cancel_cb), application);
+ G_CALLBACK (gpk_application_allow_cancel_cb), application);
application->priv->client_files = pk_client_new ();
pk_client_set_use_buffer (application->priv->client_files, TRUE, NULL);
g_signal_connect (application->priv->client_files, "files",
- G_CALLBACK (pk_application_files_cb), application);
+ G_CALLBACK (gpk_application_files_cb), application);
g_signal_connect (application->priv->client_files, "error-code",
- G_CALLBACK (pk_application_error_code_cb), application);
+ G_CALLBACK (gpk_application_error_code_cb), application);
g_signal_connect (application->priv->client_files, "finished",
- G_CALLBACK (pk_application_finished_cb), application);
+ G_CALLBACK (gpk_application_finished_cb), application);
g_signal_connect (application->priv->client_files, "progress-changed",
- G_CALLBACK (pk_application_progress_changed_cb), application);
+ G_CALLBACK (gpk_application_progress_changed_cb), application);
g_signal_connect (application->priv->client_files, "status-changed",
- G_CALLBACK (pk_application_status_changed_cb), application);
+ G_CALLBACK (gpk_application_status_changed_cb), application);
g_signal_connect (application->priv->client_files, "allow-cancel",
- G_CALLBACK (pk_application_allow_cancel_cb), application);
+ G_CALLBACK (gpk_application_allow_cancel_cb), application);
/* get actions */
application->priv->role_list = pk_client_get_actions (application->priv->client_action);
@@ -1942,7 +2033,7 @@
/* Get the main window quit */
g_signal_connect (main_window, "delete_event",
- G_CALLBACK (pk_application_delete_event_cb), application);
+ G_CALLBACK (gpk_application_delete_event_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "hbox_package");
pk_action = polkit_action_new ();
@@ -1959,7 +2050,7 @@
NULL);
polkit_action_unref (pk_action);
g_signal_connect (application->priv->install_action, "activate",
- G_CALLBACK (pk_application_install_cb), application);
+ G_CALLBACK (gpk_application_install_cb), application);
button = polkit_gnome_action_create_button (application->priv->install_action);
gtk_box_pack_start (GTK_BOX (widget), button, FALSE, FALSE, 0);
@@ -1979,7 +2070,7 @@
NULL);
polkit_action_unref (pk_action);
g_signal_connect (application->priv->remove_action, "activate",
- G_CALLBACK (pk_application_remove_cb), application);
+ G_CALLBACK (gpk_application_remove_cb), application);
button = polkit_gnome_action_create_button (application->priv->remove_action);
gtk_box_pack_start (GTK_BOX (widget), button, FALSE, FALSE, 0);
@@ -1987,16 +2078,16 @@
widget = glade_xml_get_widget (application->priv->glade_xml, "button_homepage");
g_signal_connect (widget, "clicked",
- G_CALLBACK (pk_application_homepage_cb), application);
+ G_CALLBACK (gpk_application_homepage_cb), application);
gtk_widget_set_tooltip_text (widget, _("Visit homepage for selected package"));
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_about");
g_signal_connect (widget, "activate",
- G_CALLBACK (pk_application_menu_about_cb), application);
+ G_CALLBACK (gpk_application_menu_about_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_help");
g_signal_connect (widget, "activate",
- G_CALLBACK (pk_application_menu_help_cb), application);
+ G_CALLBACK (gpk_application_menu_help_cb), application);
pk_action = polkit_action_new ();
polkit_action_set_action_id (pk_action, "org.freedesktop.packagekit.refresh-cache");
@@ -2012,7 +2103,7 @@
NULL);
polkit_action_unref (pk_action);
g_signal_connect (application->priv->refresh_action, "activate",
- G_CALLBACK (pk_application_menu_refresh_cb), application);
+ G_CALLBACK (gpk_application_menu_refresh_cb), application);
item = gtk_action_create_menu_item (GTK_ACTION (application->priv->refresh_action));
widget = glade_xml_get_widget (application->priv->glade_xml, "menu_system");
@@ -2020,55 +2111,55 @@
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_sources");
g_signal_connect (widget, "activate",
- G_CALLBACK (pk_application_menu_sources_cb), application);
+ G_CALLBACK (gpk_application_menu_sources_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "imagemenuitem_quit");
g_signal_connect (widget, "activate",
- G_CALLBACK (pk_application_menu_quit_cb), application);
+ G_CALLBACK (gpk_application_menu_quit_cb), application);
/* installed filter */
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_installed_yes");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_installed_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_installed_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_installed_no");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_installed_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_installed_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_installed_both");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_installed_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_installed_cb), application);
/* devel filter */
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_devel_yes");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_devel_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_devel_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_devel_no");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_devel_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_devel_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_devel_both");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_devel_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_devel_cb), application);
/* gui filter */
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_gui_yes");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_gui_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_gui_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_gui_no");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_gui_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_gui_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_gui_both");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_gui_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_gui_cb), application);
/* free filter */
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_free_yes");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_free_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_free_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_free_no");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_free_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_free_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_free_both");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_free_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_free_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "vbox_description_pane");
gtk_widget_hide (widget);
@@ -2079,17 +2170,17 @@
/* basename filter */
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_basename");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_basename_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_basename_cb), application);
/* newest filter */
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_newest");
g_signal_connect (widget, "toggled",
- G_CALLBACK (pk_application_menu_filter_newest_cb), application);
+ G_CALLBACK (gpk_application_menu_filter_newest_cb), application);
/* Remove description/file list if needed. */
widget = glade_xml_get_widget (application->priv->glade_xml, "notebook_description");
g_signal_connect (widget, "switch-page",
- G_CALLBACK (pk_application_notebook_changed_cb), application);
+ G_CALLBACK (gpk_application_notebook_changed_cb), application);
if (pk_enum_list_contains (application->priv->role_list, PK_ROLE_ENUM_GET_DESCRIPTION) == FALSE) {
vbox = glade_xml_get_widget (application->priv->glade_xml, "vbox_description");
page = gtk_notebook_page_num (GTK_NOTEBOOK (widget), vbox);
@@ -2132,21 +2223,28 @@
/* simple find button */
widget = glade_xml_get_widget (application->priv->glade_xml, "button_find");
g_signal_connect (widget, "clicked",
- G_CALLBACK (pk_application_find_cb), application);
+ G_CALLBACK (gpk_application_find_cb), application);
gtk_widget_set_tooltip_text (widget, _("Find packages"));
- /* cancel button */
+ /* search cancel button */
widget = glade_xml_get_widget (application->priv->glade_xml, "button_cancel");
g_signal_connect (widget, "clicked",
- G_CALLBACK (pk_application_cancel_cb), application);
+ G_CALLBACK (gpk_application_cancel_cb), application);
gtk_widget_set_tooltip_text (widget, _("Cancel search"));
gtk_widget_hide (widget);
+ /* cancel button */
+ widget = glade_xml_get_widget (application->priv->glade_xml, "button_cancel2");
+ g_signal_connect (widget, "clicked",
+ G_CALLBACK (gpk_application_cancel_cb), application);
+ gtk_widget_set_tooltip_text (widget, _("Cancel action"));
+ gtk_widget_hide (widget);
+
/* the fancy text entry widget */
widget = glade_xml_get_widget (application->priv->glade_xml, "entry_text");
/* autocompletion can be turned off as it's slow */
- autocomplete = gconf_client_get_bool (application->priv->gconf_client, PK_CONF_AUTOCOMPLETE, NULL);
+ autocomplete = gconf_client_get_bool (application->priv->gconf_client, GPK_CONF_AUTOCOMPLETE, NULL);
if (autocomplete) {
/* create the completion object */
completion = gtk_entry_completion_new ();
@@ -2156,7 +2254,7 @@
g_object_unref (completion);
/* create a tree model and use it as the completion model */
- completion_model = pk_application_create_completion_model ();
+ completion_model = gpk_application_create_completion_model ();
gtk_entry_completion_set_model (completion, completion_model);
g_object_unref (completion_model);
@@ -2170,12 +2268,12 @@
gtk_widget_show (widget);
sexy_icon_entry_set_icon_highlight (SEXY_ICON_ENTRY (widget), SEXY_ICON_ENTRY_PRIMARY, TRUE);
g_signal_connect (widget, "activate",
- G_CALLBACK (pk_application_find_cb), application);
+ G_CALLBACK (gpk_application_find_cb), application);
g_signal_connect (widget, "icon-pressed",
- G_CALLBACK (pk_application_entry_text_icon_pressed_cb), application);
+ G_CALLBACK (gpk_application_entry_text_icon_pressed_cb), application);
/* coldplug icon to default to search by name*/
- pk_application_menu_search_by_name (NULL, application);
+ gpk_application_menu_search_by_name (NULL, application);
/* hide the filters we can't support */
if (pk_enum_list_contains (application->priv->filter_list, PK_FILTER_ENUM_INSTALLED) == FALSE) {
@@ -2194,20 +2292,37 @@
widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_free");
gtk_widget_hide (widget);
}
- if (pk_enum_list_contains (application->priv->filter_list, PK_FILTER_ENUM_BASENAME) == FALSE) {
- widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_basename");
+
+ /* BASENAME, use by default, or hide */
+ widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_basename");
+ if (pk_enum_list_contains (application->priv->filter_list, PK_FILTER_ENUM_BASENAME)) {
+ enabled = gconf_client_get_bool (application->priv->gconf_client,
+ GPK_CONF_APPLICATION_FILTER_BASENAME, NULL);
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), enabled);
+ /* work round a gtk2+ bug: toggled should be fired when doing gtk_check_menu_item_set_active */
+ gpk_application_menu_filter_basename_cb (widget, application);
+ } else {
gtk_widget_hide (widget);
}
- if (pk_enum_list_contains (application->priv->filter_list, PK_FILTER_ENUM_NEWEST) == FALSE) {
- widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_newest");
+
+ /* NEWEST, use by default, or hide */
+ widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_newest");
+ if (pk_enum_list_contains (application->priv->filter_list, PK_FILTER_ENUM_NEWEST)) {
+ /* set from remembered state */
+ enabled = gconf_client_get_bool (application->priv->gconf_client,
+ GPK_CONF_APPLICATION_FILTER_NEWEST, NULL);
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), enabled);
+ /* work round a gtk2+ bug: toggled should be fired when doing gtk_check_menu_item_set_active */
+ gpk_application_menu_filter_newest_cb (widget, application);
+ } else {
gtk_widget_hide (widget);
}
widget = glade_xml_get_widget (application->priv->glade_xml, "entry_text");
g_signal_connect (widget, "key-press-event",
- G_CALLBACK (pk_application_text_changed_cb), application);
+ G_CALLBACK (gpk_application_text_changed_cb), application);
g_signal_connect (widget, "key-release-event",
- G_CALLBACK (pk_application_text_changed_cb), application);
+ G_CALLBACK (gpk_application_text_changed_cb), application);
widget = glade_xml_get_widget (application->priv->glade_xml, "button_find");
gtk_widget_set_sensitive (widget, FALSE);
@@ -2217,11 +2332,13 @@
widget = glade_xml_get_widget (application->priv->glade_xml, "treeview_packages");
gtk_tree_view_columns_autosize (GTK_TREE_VIEW (widget));
+ g_signal_connect (GTK_TREE_VIEW (widget), "row-activated",
+ G_CALLBACK (gpk_application_package_row_activated_cb), application);
/* use the in-statusbar for progress */
- application->priv->statusbar = pk_statusbar_new ();
+ application->priv->statusbar = gpk_statusbar_new ();
widget = glade_xml_get_widget (application->priv->glade_xml, "statusbar_status");
- pk_statusbar_set_widget (application->priv->statusbar, widget);
+ gpk_statusbar_set_widget (application->priv->statusbar, widget);
/* create list stores */
application->priv->packages_store = gtk_list_store_new (PACKAGES_COLUMN_LAST,
@@ -2275,18 +2392,18 @@
}
/**
- * pk_application_finalize:
+ * gpk_application_finalize:
* @object: This graph class instance
**/
static void
-pk_application_finalize (GObject *object)
+gpk_application_finalize (GObject *object)
{
- PkApplication *application;
+ GpkApplication *application;
g_return_if_fail (object != NULL);
g_return_if_fail (PK_IS_APPLICATION (object));
- application = PK_APPLICATION (object);
- application->priv = PK_APPLICATION_GET_PRIVATE (application);
+ application = GPK_APPLICATION (object);
+ application->priv = GPK_APPLICATION_GET_PRIVATE (application);
g_object_unref (application->priv->glade_xml);
g_object_unref (application->priv->packages_store);
@@ -2309,18 +2426,18 @@
g_free (application->priv->url);
g_free (application->priv->package);
- G_OBJECT_CLASS (pk_application_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gpk_application_parent_class)->finalize (object);
}
/**
- * pk_application_new:
- * Return value: new PkApplication instance.
+ * gpk_application_new:
+ * Return value: new GpkApplication instance.
**/
-PkApplication *
-pk_application_new (void)
+GpkApplication *
+gpk_application_new (void)
{
- PkApplication *application;
- application = g_object_new (PK_TYPE_APPLICATION, NULL);
- return PK_APPLICATION (application);
+ GpkApplication *application;
+ application = g_object_new (GPK_TYPE_APPLICATION, NULL);
+ return GPK_APPLICATION (application);
}
Modified: trunk/src/gpk-application.h
==============================================================================
--- trunk/src/gpk-application.h (original)
+++ trunk/src/gpk-application.h Tue Apr 1 23:21:47 2008
@@ -19,38 +19,38 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __PK_APPLICATION_H
-#define __PK_APPLICATION_H
+#ifndef __GPK_APPLICATION_H
+#define __GPK_APPLICATION_H
#include <glib-object.h>
G_BEGIN_DECLS
-#define PK_TYPE_APPLICATION (pk_application_get_type ())
-#define PK_APPLICATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PK_TYPE_APPLICATION, PkApplication))
-#define PK_APPLICATION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), PK_TYPE_APPLICATION, PkApplicationClass))
-#define PK_IS_APPLICATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PK_TYPE_APPLICATION))
-#define PK_IS_APPLICATION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), PK_TYPE_APPLICATION))
-#define PK_APPLICATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PK_TYPE_APPLICATION, PkApplicationClass))
+#define GPK_TYPE_APPLICATION (gpk_application_get_type ())
+#define GPK_APPLICATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GPK_TYPE_APPLICATION, GpkApplication))
+#define GPK_APPLICATION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GPK_TYPE_APPLICATION, GpkApplicationClass))
+#define PK_IS_APPLICATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GPK_TYPE_APPLICATION))
+#define PK_IS_APPLICATION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GPK_TYPE_APPLICATION))
+#define GPK_APPLICATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GPK_TYPE_APPLICATION, GpkApplicationClass))
-typedef struct PkApplicationPrivate PkApplicationPrivate;
+typedef struct GpkApplicationPrivate GpkApplicationPrivate;
typedef struct
{
GObject parent;
- PkApplicationPrivate *priv;
-} PkApplication;
+ GpkApplicationPrivate *priv;
+} GpkApplication;
typedef struct
{
GObjectClass parent_class;
- void (* action_help) (PkApplication *application);
- void (* action_close) (PkApplication *application);
-} PkApplicationClass;
+ void (* action_help) (GpkApplication *application);
+ void (* action_close) (GpkApplication *application);
+} GpkApplicationClass;
-GType pk_application_get_type (void);
-PkApplication *pk_application_new (void);
+GType gpk_application_get_type (void);
+GpkApplication *gpk_application_new (void);
G_END_DECLS
-#endif /* __PK_APPLICATION_H */
+#endif /* __GPK_APPLICATION_H */
Modified: trunk/src/gpk-auto-refresh.c
==============================================================================
--- trunk/src/gpk-auto-refresh.c (original)
+++ trunk/src/gpk-auto-refresh.c Tue Apr 1 23:21:47 2008
@@ -43,12 +43,12 @@
#include "gpk-common.h"
#include "gpk-auto-refresh.h"
-static void pk_auto_refresh_class_init (PkAutoRefreshClass *klass);
-static void pk_auto_refresh_init (PkAutoRefresh *arefresh);
-static void pk_auto_refresh_finalize (GObject *object);
+static void gpk_auto_refresh_class_init (GpkAutoRefreshClass *klass);
+static void gpk_auto_refresh_init (GpkAutoRefresh *arefresh);
+static void gpk_auto_refresh_finalize (GObject *object);
-#define PK_AUTO_REFRESH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PK_TYPE_AUTO_REFRESH, PkAutoRefreshPrivate))
-#define PK_AUTO_REFRESH_PERIODIC_CHECK 60*60 /* force check for updates every this much time */
+#define GPK_AUTO_REFRESH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPK_TYPE_AUTO_REFRESH, GpkAutoRefreshPrivate))
+#define GPK_AUTO_REFRESH_PERIODIC_CHECK 60*60 /* force check for updates every this much time */
/*
* at startup, after a small delay, force a GetUpdates call
@@ -57,7 +57,7 @@
- if we are online and it's been longer than the timeout since getting the updates period then GetUpdates
*/
-struct PkAutoRefreshPrivate
+struct GpkAutoRefreshPrivate
{
gboolean session_idle;
gboolean on_battery;
@@ -82,18 +82,18 @@
static guint signals [LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (PkAutoRefresh, pk_auto_refresh, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GpkAutoRefresh, gpk_auto_refresh, G_TYPE_OBJECT)
/**
- * pk_auto_refresh_class_init:
- * @klass: The PkAutoRefreshClass
+ * gpk_auto_refresh_class_init:
+ * @klass: The GpkAutoRefreshClass
**/
static void
-pk_auto_refresh_class_init (PkAutoRefreshClass *klass)
+gpk_auto_refresh_class_init (GpkAutoRefreshClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = pk_auto_refresh_finalize;
- g_type_class_add_private (klass, sizeof (PkAutoRefreshPrivate));
+ object_class->finalize = gpk_auto_refresh_finalize;
+ g_type_class_add_private (klass, sizeof (GpkAutoRefreshPrivate));
signals [REFRESH_CACHE] =
g_signal_new ("refresh-cache",
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
@@ -107,10 +107,10 @@
}
/**
- * pk_auto_refresh_signal_refresh_cache:
+ * gpk_auto_refresh_signal_refresh_cache:
**/
static gboolean
-pk_auto_refresh_signal_refresh_cache (PkAutoRefresh *arefresh)
+gpk_auto_refresh_signal_refresh_cache (GpkAutoRefresh *arefresh)
{
g_return_val_if_fail (arefresh != NULL, FALSE);
g_return_val_if_fail (PK_IS_AUTO_REFRESH (arefresh), FALSE);
@@ -121,10 +121,10 @@
}
/**
- * pk_auto_refresh_signal_get_updates:
+ * gpk_auto_refresh_signal_get_updates:
**/
static gboolean
-pk_auto_refresh_signal_get_updates (PkAutoRefresh *arefresh)
+gpk_auto_refresh_signal_get_updates (GpkAutoRefresh *arefresh)
{
g_return_val_if_fail (arefresh != NULL, FALSE);
g_return_val_if_fail (PK_IS_AUTO_REFRESH (arefresh), FALSE);
@@ -135,12 +135,12 @@
}
/**
- * pk_auto_refresh_convert_frequency:
+ * gpk_auto_refresh_convert_frequency:
*
* Return value: The number of seconds for the frequency period
**/
static guint
-pk_auto_refresh_convert_frequency (PkFreqEnum freq)
+gpk_auto_refresh_convert_frequency (PkFreqEnum freq)
{
if (freq == PK_FREQ_ENUM_UNKNOWN) {
pk_warning ("no schema");
@@ -163,10 +163,10 @@
}
/**
- * pk_auto_refresh_convert_frequency_text:
+ * gpk_auto_refresh_convert_frequency_text:
**/
static guint
-pk_auto_refresh_convert_frequency_text (PkAutoRefresh *arefresh, const gchar *key)
+gpk_auto_refresh_convert_frequency_text (GpkAutoRefresh *arefresh, const gchar *key)
{
const gchar *freq_text;
PkFreqEnum freq;
@@ -183,14 +183,14 @@
/* convert to enum and get seconds */
freq = pk_freq_enum_from_text (freq_text);
- return pk_auto_refresh_convert_frequency (freq);
+ return gpk_auto_refresh_convert_frequency (freq);
}
/**
- * pk_auto_refresh_maybe_refresh_cache:
+ * gpk_auto_refresh_maybe_refresh_cache:
**/
static gboolean
-pk_auto_refresh_maybe_refresh_cache (PkAutoRefresh *arefresh)
+gpk_auto_refresh_maybe_refresh_cache (GpkAutoRefresh *arefresh)
{
guint time;
guint thresh;
@@ -219,7 +219,7 @@
}
/* get this each time, as it may have changed behind out back */
- thresh = pk_auto_refresh_convert_frequency_text (arefresh, PK_CONF_FREQUENCY_REFRESH_CACHE);
+ thresh = gpk_auto_refresh_convert_frequency_text (arefresh, GPK_CONF_FREQUENCY_REFRESH_CACHE);
/* have we passed the timout? */
if (time < thresh) {
@@ -227,15 +227,15 @@
return FALSE;
}
- pk_auto_refresh_signal_refresh_cache (arefresh);
+ gpk_auto_refresh_signal_refresh_cache (arefresh);
return TRUE;
}
/**
- * pk_auto_refresh_maybe_get_updates:
+ * gpk_auto_refresh_maybe_get_updates:
**/
static gboolean
-pk_auto_refresh_maybe_get_updates (PkAutoRefresh *arefresh)
+gpk_auto_refresh_maybe_get_updates (GpkAutoRefresh *arefresh)
{
guint time;
guint thresh;
@@ -252,7 +252,7 @@
}
/* get this each time, as it may have changed behind out back */
- thresh = pk_auto_refresh_convert_frequency_text (arefresh, PK_CONF_FREQUENCY_GET_UPDATES);
+ thresh = gpk_auto_refresh_convert_frequency_text (arefresh, GPK_CONF_FREQUENCY_GET_UPDATES);
/* have we passed the timout? */
if (time < thresh) {
@@ -260,15 +260,15 @@
return FALSE;
}
- pk_auto_refresh_signal_get_updates (arefresh);
+ gpk_auto_refresh_signal_get_updates (arefresh);
return TRUE;
}
/**
- * pk_auto_refresh_change_state:
+ * gpk_auto_refresh_change_state:
**/
static gboolean
-pk_auto_refresh_change_state (PkAutoRefresh *arefresh)
+gpk_auto_refresh_change_state (GpkAutoRefresh *arefresh)
{
g_return_val_if_fail (arefresh != NULL, FALSE);
g_return_val_if_fail (PK_IS_AUTO_REFRESH (arefresh), FALSE);
@@ -287,51 +287,51 @@
/* we do this to get an icon at startup */
if (arefresh->priv->sent_get_updates == FALSE) {
- pk_auto_refresh_signal_get_updates (arefresh);
+ gpk_auto_refresh_signal_get_updates (arefresh);
arefresh->priv->sent_get_updates = TRUE;
return TRUE;
}
/* try to do both */
- pk_auto_refresh_maybe_refresh_cache (arefresh);
- pk_auto_refresh_maybe_get_updates (arefresh);
+ gpk_auto_refresh_maybe_refresh_cache (arefresh);
+ gpk_auto_refresh_maybe_get_updates (arefresh);
return TRUE;
}
/**
- * pk_auto_refresh_idle_cb:
+ * gpk_auto_refresh_idle_cb:
**/
static void
-pk_auto_refresh_idle_cb (DBusGProxy *proxy, gboolean is_idle, PkAutoRefresh *arefresh)
+gpk_auto_refresh_idle_cb (DBusGProxy *proxy, gboolean is_idle, GpkAutoRefresh *arefresh)
{
g_return_if_fail (arefresh != NULL);
g_return_if_fail (PK_IS_AUTO_REFRESH (arefresh));
pk_debug ("setting is_idle %i", is_idle);
arefresh->priv->session_idle = is_idle;
- pk_auto_refresh_change_state (arefresh);
+ gpk_auto_refresh_change_state (arefresh);
}
/**
- * pk_auto_refresh_on_battery_cb:
+ * gpk_auto_refresh_on_battery_cb:
**/
static void
-pk_auto_refresh_on_battery_cb (DBusGProxy *proxy, gboolean on_battery, PkAutoRefresh *arefresh)
+gpk_auto_refresh_on_battery_cb (DBusGProxy *proxy, gboolean on_battery, GpkAutoRefresh *arefresh)
{
g_return_if_fail (arefresh != NULL);
g_return_if_fail (PK_IS_AUTO_REFRESH (arefresh));
pk_debug ("setting on_battery %i", on_battery);
arefresh->priv->on_battery = on_battery;
- pk_auto_refresh_change_state (arefresh);
+ gpk_auto_refresh_change_state (arefresh);
}
/**
- * pk_auto_refresh_get_on_battery:
+ * gpk_auto_refresh_get_on_battery:
**/
gboolean
-pk_auto_refresh_get_on_battery (PkAutoRefresh *arefresh)
+gpk_auto_refresh_get_on_battery (GpkAutoRefresh *arefresh)
{
g_return_val_if_fail (arefresh != NULL, FALSE);
g_return_val_if_fail (PK_IS_AUTO_REFRESH (arefresh), FALSE);
@@ -339,44 +339,44 @@
}
/**
- * pk_auto_refresh_network_changed_cb:
+ * gpk_auto_refresh_network_changed_cb:
**/
static void
-pk_auto_refresh_network_changed_cb (PkNetwork *network, gboolean online, PkAutoRefresh *arefresh)
+gpk_auto_refresh_network_changed_cb (PkNetwork *network, gboolean online, GpkAutoRefresh *arefresh)
{
g_return_if_fail (arefresh != NULL);
g_return_if_fail (PK_IS_AUTO_REFRESH (arefresh));
pk_debug ("setting online %i", online);
arefresh->priv->network_active = online;
- pk_auto_refresh_change_state (arefresh);
+ gpk_auto_refresh_change_state (arefresh);
}
/**
- * pk_auto_refresh_timeout_cb:
+ * gpk_auto_refresh_timeout_cb:
**/
static gboolean
-pk_auto_refresh_timeout_cb (gpointer user_data)
+gpk_auto_refresh_timeout_cb (gpointer user_data)
{
- PkAutoRefresh *arefresh = PK_AUTO_REFRESH (user_data);
+ GpkAutoRefresh *arefresh = GPK_AUTO_REFRESH (user_data);
g_return_val_if_fail (arefresh != NULL, FALSE);
g_return_val_if_fail (PK_IS_AUTO_REFRESH (arefresh), FALSE);
/* triggered once an hour */
- pk_auto_refresh_change_state (arefresh);
+ gpk_auto_refresh_change_state (arefresh);
/* always return */
return TRUE;
}
/**
- * pk_auto_refresh_check_delay_cb:
+ * gpk_auto_refresh_check_delay_cb:
**/
static gboolean
-pk_auto_refresh_check_delay_cb (gpointer user_data)
+gpk_auto_refresh_check_delay_cb (gpointer user_data)
{
- PkAutoRefresh *arefresh = PK_AUTO_REFRESH (user_data);
+ GpkAutoRefresh *arefresh = GPK_AUTO_REFRESH (user_data);
g_return_val_if_fail (arefresh != NULL, FALSE);
g_return_val_if_fail (PK_IS_AUTO_REFRESH (arefresh), FALSE);
@@ -388,7 +388,7 @@
}
/* if we failed to do the refresh cache at first boot, we'll pick up an event */
- pk_auto_refresh_change_state (arefresh);
+ gpk_auto_refresh_change_state (arefresh);
/* we don't want to do this timer again as we sent the signal */
return FALSE;
@@ -398,7 +398,7 @@
* pk_connection_gpm_changed_cb:
**/
static void
-pk_connection_gpm_changed_cb (LibGBus *libgbus, gboolean connected, PkAutoRefresh *arefresh)
+pk_connection_gpm_changed_cb (LibGBus *libgbus, gboolean connected, GpkAutoRefresh *arefresh)
{
GError *error = NULL;
gboolean on_battery;
@@ -431,7 +431,7 @@
dbus_g_proxy_add_signal (arefresh->priv->proxy_gpm, "OnBatteryChanged",
G_TYPE_BOOLEAN, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (arefresh->priv->proxy_gpm, "OnBatteryChanged",
- G_CALLBACK (pk_auto_refresh_on_battery_cb),
+ G_CALLBACK (gpk_auto_refresh_on_battery_cb),
arefresh, NULL);
/* coldplug the battery state */
ret = dbus_g_proxy_call (arefresh->priv->proxy_gpm, "GetOnBattery", &error,
@@ -452,7 +452,7 @@
* pk_connection_gs_changed_cb:
**/
static void
-pk_connection_gs_changed_cb (LibGBus *libgbus, gboolean connected, PkAutoRefresh *arefresh)
+pk_connection_gs_changed_cb (LibGBus *libgbus, gboolean connected, GpkAutoRefresh *arefresh)
{
GError *error = NULL;
@@ -482,22 +482,22 @@
dbus_g_proxy_add_signal (arefresh->priv->proxy_gs, "SessionIdleChanged",
G_TYPE_BOOLEAN, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (arefresh->priv->proxy_gs, "SessionIdleChanged",
- G_CALLBACK (pk_auto_refresh_idle_cb),
+ G_CALLBACK (gpk_auto_refresh_idle_cb),
arefresh, NULL);
}
/**
- * pk_auto_refresh_init:
+ * gpk_auto_refresh_init:
* @auto_refresh: This class instance
**/
static void
-pk_auto_refresh_init (PkAutoRefresh *arefresh)
+gpk_auto_refresh_init (GpkAutoRefresh *arefresh)
{
guint value;
GError *error = NULL;
- arefresh->priv = PK_AUTO_REFRESH_GET_PRIVATE (arefresh);
+ arefresh->priv = GPK_AUTO_REFRESH_GET_PRIVATE (arefresh);
arefresh->priv->on_battery = FALSE;
arefresh->priv->session_idle = FALSE;
arefresh->priv->network_active = FALSE;
@@ -537,32 +537,32 @@
* NetworkManager or alternative */
arefresh->priv->network = pk_network_new ();
g_signal_connect (arefresh->priv->network, "online",
- G_CALLBACK (pk_auto_refresh_network_changed_cb), arefresh);
+ G_CALLBACK (gpk_auto_refresh_network_changed_cb), arefresh);
if (pk_network_is_online (arefresh->priv->network)) {
arefresh->priv->network_active = TRUE;
}
/* we check this in case we miss one of the async signals */
- g_timeout_add_seconds (PK_AUTO_REFRESH_PERIODIC_CHECK, pk_auto_refresh_timeout_cb, arefresh);
+ g_timeout_add_seconds (GPK_AUTO_REFRESH_PERIODIC_CHECK, gpk_auto_refresh_timeout_cb, arefresh);
/* wait a little bit for login to quiece, even if everything is okay */
- value = gconf_client_get_int (arefresh->priv->gconf_client, PK_CONF_SESSION_STARTUP_TIMEOUT, NULL);
- g_timeout_add_seconds (value, pk_auto_refresh_check_delay_cb, arefresh);
+ value = gconf_client_get_int (arefresh->priv->gconf_client, GPK_CONF_SESSION_STARTUP_TIMEOUT, NULL);
+ g_timeout_add_seconds (value, gpk_auto_refresh_check_delay_cb, arefresh);
}
/**
- * pk_auto_refresh_finalize:
+ * gpk_auto_refresh_finalize:
* @object: The object to finalize
**/
static void
-pk_auto_refresh_finalize (GObject *object)
+gpk_auto_refresh_finalize (GObject *object)
{
- PkAutoRefresh *arefresh;
+ GpkAutoRefresh *arefresh;
g_return_if_fail (object != NULL);
g_return_if_fail (PK_IS_AUTO_REFRESH (object));
- arefresh = PK_AUTO_REFRESH (object);
+ arefresh = GPK_AUTO_REFRESH (object);
g_return_if_fail (arefresh->priv != NULL);
g_object_unref (arefresh->priv->client);
@@ -579,19 +579,19 @@
g_object_unref (arefresh->priv->proxy_gpm);
}
- G_OBJECT_CLASS (pk_auto_refresh_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gpk_auto_refresh_parent_class)->finalize (object);
}
/**
- * pk_auto_refresh_new:
+ * gpk_auto_refresh_new:
*
- * Return value: a new PkAutoRefresh object.
+ * Return value: a new GpkAutoRefresh object.
**/
-PkAutoRefresh *
-pk_auto_refresh_new (void)
+GpkAutoRefresh *
+gpk_auto_refresh_new (void)
{
- PkAutoRefresh *arefresh;
- arefresh = g_object_new (PK_TYPE_AUTO_REFRESH, NULL);
- return PK_AUTO_REFRESH (arefresh);
+ GpkAutoRefresh *arefresh;
+ arefresh = g_object_new (GPK_TYPE_AUTO_REFRESH, NULL);
+ return GPK_AUTO_REFRESH (arefresh);
}
Modified: trunk/src/gpk-auto-refresh.h
==============================================================================
--- trunk/src/gpk-auto-refresh.h (original)
+++ trunk/src/gpk-auto-refresh.h Tue Apr 1 23:21:47 2008
@@ -19,39 +19,39 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __PK_AUTO_REFRESH_H
-#define __PK_AUTO_REFRESH_H
+#ifndef __GPK_AUTO_REFRESH_H
+#define __GPK_AUTO_REFRESH_H
#include <glib-object.h>
G_BEGIN_DECLS
-#define PK_TYPE_AUTO_REFRESH (pk_auto_refresh_get_type ())
-#define PK_AUTO_REFRESH(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PK_TYPE_AUTO_REFRESH, PkAutoRefresh))
-#define PK_AUTO_REFRESH_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), PK_TYPE_AUTO_REFRESH, PkAutoRefreshClass))
-#define PK_IS_AUTO_REFRESH(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PK_TYPE_AUTO_REFRESH))
-#define PK_IS_AUTO_REFRESH_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), PK_TYPE_AUTO_REFRESH))
-#define PK_AUTO_REFRESH_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PK_TYPE_AUTO_REFRESH, PkAutoRefreshClass))
-#define PK_AUTO_REFRESH_ERROR (pk_auto_refresh_error_quark ())
-#define PK_AUTO_REFRESH_TYPE_ERROR (pk_auto_refresh_error_get_type ())
+#define GPK_TYPE_AUTO_REFRESH (gpk_auto_refresh_get_type ())
+#define GPK_AUTO_REFRESH(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GPK_TYPE_AUTO_REFRESH, GpkAutoRefresh))
+#define GPK_AUTO_REFRESH_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GPK_TYPE_AUTO_REFRESH, GpkAutoRefreshClass))
+#define PK_IS_AUTO_REFRESH(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GPK_TYPE_AUTO_REFRESH))
+#define PK_IS_AUTO_REFRESH_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GPK_TYPE_AUTO_REFRESH))
+#define GPK_AUTO_REFRESH_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GPK_TYPE_AUTO_REFRESH, GpkAutoRefreshClass))
+#define GPK_AUTO_REFRESH_ERROR (gpk_auto_refresh_error_quark ())
+#define GPK_AUTO_REFRESH_TYPE_ERROR (gpk_auto_refresh_error_get_type ())
-typedef struct PkAutoRefreshPrivate PkAutoRefreshPrivate;
+typedef struct GpkAutoRefreshPrivate GpkAutoRefreshPrivate;
typedef struct
{
GObject parent;
- PkAutoRefreshPrivate *priv;
-} PkAutoRefresh;
+ GpkAutoRefreshPrivate *priv;
+} GpkAutoRefresh;
typedef struct
{
GObjectClass parent_class;
-} PkAutoRefreshClass;
+} GpkAutoRefreshClass;
-GType pk_auto_refresh_get_type (void);
-PkAutoRefresh *pk_auto_refresh_new (void);
-gboolean pk_auto_refresh_get_on_battery (PkAutoRefresh *arefresh);
+GType gpk_auto_refresh_get_type (void);
+GpkAutoRefresh *gpk_auto_refresh_new (void);
+gboolean gpk_auto_refresh_get_on_battery (GpkAutoRefresh *arefresh);
G_END_DECLS
-#endif /* __PK_AUTO_REFRESH_H */
+#endif /* __GPK_AUTO_REFRESH_H */
Modified: trunk/src/gpk-backend-status.c
==============================================================================
--- trunk/src/gpk-backend-status.c (original)
+++ trunk/src/gpk-backend-status.c Tue Apr 1 23:21:47 2008
@@ -120,7 +120,7 @@
/* general stuff */
retval = pk_client_get_backend_detail (client, &name, &author, NULL);
if (FALSE == retval) {
- pk_warning (_("Exiting as backend details could not be retrieved\n"));
+ pk_warning (_("Exiting as backend details could not be retrieved"));
return 1;
}
Modified: trunk/src/gpk-cell-renderer-uri.c
==============================================================================
--- trunk/src/gpk-cell-renderer-uri.c (original)
+++ trunk/src/gpk-cell-renderer-uri.c Tue Apr 1 23:21:47 2008
@@ -39,18 +39,18 @@
LAST_SIGNAL
};
-G_DEFINE_TYPE (PkCellRendererUri, pk_cell_renderer_uri, GTK_TYPE_CELL_RENDERER_TEXT)
+G_DEFINE_TYPE (GpkCellRendererUri, gpk_cell_renderer_uri, GTK_TYPE_CELL_RENDERER_TEXT)
static gpointer parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
static gboolean
-pk_cell_renderer_uri_activate (GtkCellRenderer *cell, GdkEvent *event,
- GtkWidget *widget, const gchar *path,
- GdkRectangle *background_area,
- GdkRectangle *cell_area, GtkCellRendererState flags)
+gpk_cell_renderer_uri_activate (GtkCellRenderer *cell, GdkEvent *event,
+ GtkWidget *widget, const gchar *path,
+ GdkRectangle *background_area,
+ GdkRectangle *cell_area, GtkCellRendererState flags)
{
- PkCellRendererUri *cru = PK_CELL_RENDERER_URI (g_object_get_data (G_OBJECT (cell), "cru"));
+ GpkCellRendererUri *cru = GPK_CELL_RENDERER_URI (g_object_get_data (G_OBJECT (cell), "cru"));
/* nothing to do */
if (cru->uri == NULL) {
@@ -64,12 +64,10 @@
}
static void
-pk_cell_renderer_uri_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec)
+gpk_cell_renderer_uri_get_property (GObject *object, guint param_id,
+ GValue *value, GParamSpec *pspec)
{
- PkCellRendererUri *cru = PK_CELL_RENDERER_URI (object);
+ GpkCellRendererUri *cru = GPK_CELL_RENDERER_URI (object);
switch (param_id) {
case PROP_URI:
@@ -85,12 +83,10 @@
}
static void
-pk_cell_renderer_uri_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec)
+gpk_cell_renderer_uri_set_property (GObject *object, guint param_id,
+ const GValue *value, GParamSpec *pspec)
{
- PkCellRendererUri *cru = PK_CELL_RENDERER_URI (object);
+ GpkCellRendererUri *cru = GPK_CELL_RENDERER_URI (object);
switch (param_id) {
case PROP_URI:
@@ -109,7 +105,7 @@
}
static void
-pk_cell_renderer_uri_render (GtkCellRenderer *cell,
+gpk_cell_renderer_uri_render (GtkCellRenderer *cell,
GdkWindow *window,
GtkWidget *widget,
GdkRectangle *background_area,
@@ -118,7 +114,7 @@
GtkCellRendererState flags)
{
GdkCursor *cursor;
- PkCellRendererUri *cru = PK_CELL_RENDERER_URI (cell);
+ GpkCellRendererUri *cru = GPK_CELL_RENDERER_URI (cell);
/* set cursor */
if (cru->uri == NULL) {
@@ -151,7 +147,7 @@
}
static void
-pk_cell_renderer_uri_class_init (PkCellRendererUriClass *class)
+gpk_cell_renderer_uri_class_init (GpkCellRendererUriClass *class)
{
GtkCellRendererClass *cell_renderer_class;
GObjectClass *object_class = G_OBJECT_CLASS (class);
@@ -159,11 +155,11 @@
parent_class = g_type_class_peek_parent (class);
cell_renderer_class = GTK_CELL_RENDERER_CLASS (class);
- cell_renderer_class->activate = pk_cell_renderer_uri_activate;
- cell_renderer_class->render = pk_cell_renderer_uri_render;
+ cell_renderer_class->activate = gpk_cell_renderer_uri_activate;
+ cell_renderer_class->render = gpk_cell_renderer_uri_render;
- object_class->get_property = pk_cell_renderer_uri_get_property;
- object_class->set_property = pk_cell_renderer_uri_set_property;
+ object_class->get_property = gpk_cell_renderer_uri_get_property;
+ object_class->set_property = gpk_cell_renderer_uri_set_property;
g_object_class_install_property (object_class, PROP_URI,
g_param_spec_string ("uri", "URI",
@@ -173,28 +169,28 @@
"If the URI has been clicked", FALSE, G_PARAM_READWRITE));
signals [CLICKED] =
- g_signal_new ( "clicked",
+ g_signal_new ("clicked",
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (PkCellRendererUriClass, clicked), NULL, NULL,
+ G_STRUCT_OFFSET (GpkCellRendererUriClass, clicked), NULL, NULL,
g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
}
/**
- * pk_cell_renderer_uri_init:
+ * gpk_cell_renderer_uri_init:
**/
static void
-pk_cell_renderer_uri_init (PkCellRendererUri *cru)
+gpk_cell_renderer_uri_init (GpkCellRendererUri *cru)
{
cru->uri = NULL;
cru->clicked = FALSE;
}
/**
- * pk_cell_renderer_uri_new:
+ * gpk_cell_renderer_uri_new:
**/
GtkCellRenderer *
-pk_cell_renderer_uri_new (void)
+gpk_cell_renderer_uri_new (void)
{
- return g_object_new (PK_TYPE_CELL_RENDERER_URI, NULL);
+ return g_object_new (GPK_TYPE_CELL_RENDERER_URI, NULL);
}
Modified: trunk/src/gpk-cell-renderer-uri.h
==============================================================================
--- trunk/src/gpk-cell-renderer-uri.h (original)
+++ trunk/src/gpk-cell-renderer-uri.h Tue Apr 1 23:21:47 2008
@@ -19,42 +19,42 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef PK_CELL_RENDERER_URI_H
-#define PK_CELL_RENDERER_URI_H
+#ifndef GPK_CELL_RENDERER_URI_H
+#define GPK_CELL_RENDERER_URI_H
#include <glib-object.h>
#include <gtk/gtk.h>
-#define PK_TYPE_CELL_RENDERER_URI (pk_cell_renderer_uri_get_type ())
-#define PK_CELL_RENDERER_URI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PK_TYPE_CELL_RENDERER_URI, PkCellRendererUri))
-#define PK_CELL_RENDERER_URI_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST ((cls), PK_TYPE_CELL_RENDERER_URI, PkCellRendererUriClass))
-#define PK_IS_CELL_RENDERER_URI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PK_TYPE_CELL_RENDERER_URI))
-#define PK_IS_CELL_RENDERER_URI_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE ((cls), PK_TYPE_CELL_RENDERER_URI))
-#define PK_CELL_RENDERER_URI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PK_TYPE_CELL_RENDERER_URI, PkCellRendererUriClass))
+#define GPK_TYPE_CELL_RENDERER_URI (gpk_cell_renderer_uri_get_type())
+#define GPK_CELL_RENDERER_URI(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GPK_TYPE_CELL_RENDERER_URI, GpkCellRendererUri))
+#define GPK_CELL_RENDERER_URI_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), GPK_TYPE_CELL_RENDERER_URI, GpkCellRendererUriClass))
+#define PK_IS_CELL_RENDERER_URI(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GPK_TYPE_CELL_RENDERER_URI))
+#define PK_IS_CELL_RENDERER_URI_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE((cls), GPK_TYPE_CELL_RENDERER_URI))
+#define GPK_CELL_RENDERER_URI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GPK_TYPE_CELL_RENDERER_URI, GpkCellRendererUriClass))
G_BEGIN_DECLS
-typedef struct _PkCellRendererUri PkCellRendererUri;
-typedef struct _PkCellRendererUriClass PkCellRendererUriClass;
+typedef struct _GpkCellRendererUri GpkCellRendererUri;
+typedef struct _GpkCellRendererUriClass GpkCellRendererUriClass;
-struct _PkCellRendererUri
+struct _GpkCellRendererUri
{
- GtkCellRendererText parent;
- gchar *uri;
- gboolean clicked;
+ GtkCellRendererText parent;
+ gchar *uri;
+ gboolean clicked;
};
-struct _PkCellRendererUriClass
+struct _GpkCellRendererUriClass
{
GtkCellRendererTextClass parent_class;
- void (*clicked) (PkCellRendererUri *cru,
+ void (*clicked) (GpkCellRendererUri *cru,
const gchar *uri);
};
-GType pk_cell_renderer_uri_get_type (void);
-GtkCellRenderer *pk_cell_renderer_uri_new (void);
+GType gpk_cell_renderer_uri_get_type (void);
+GtkCellRenderer *gpk_cell_renderer_uri_new (void);
G_END_DECLS
-#endif /* PK_CELL_RENDERER_URI_H */
+#endif /* GPK_CELL_RENDERER_URI_H */
Modified: trunk/src/gpk-common.c
==============================================================================
--- trunk/src/gpk-common.c (original)
+++ trunk/src/gpk-common.c Tue Apr 1 23:21:47 2008
@@ -48,7 +48,7 @@
{PK_INFO_ENUM_SECURITY, "pk-update-security"},
{PK_INFO_ENUM_BUGFIX, "pk-update-bugfix"},
{PK_INFO_ENUM_ENHANCEMENT, "pk-update-enhancement"},
- {PK_INFO_ENUM_BLOCKED, "help-browser"}, /* TODO: need better icon */
+ {PK_INFO_ENUM_BLOCKED, "pk-setup"},
{PK_INFO_ENUM_DOWNLOADING, "pk-package-download"},
{PK_INFO_ENUM_UPDATING, "pk-package-update"},
{PK_INFO_ENUM_INSTALLING, "pk-package-add"},
@@ -159,24 +159,17 @@
};
static gboolean
-try_system_restart (DBusGProxy *proxy,
- GError **error)
+try_system_restart (DBusGProxy *proxy, GError **error)
{
- return dbus_g_proxy_call_with_timeout (proxy,
- "Restart",
- INT_MAX,
- error,
- /* parameters: */
- G_TYPE_INVALID,
- /* return values: */
- G_TYPE_INVALID);
+ return dbus_g_proxy_call_with_timeout (proxy, "Restart", INT_MAX,
+ error, G_TYPE_INVALID, G_TYPE_INVALID);
}
static PolKitAction *
get_action_from_error (GError *error)
{
PolKitAction *action;
- const char *paction;
+ const gchar *paction;
action = polkit_action_new ();
@@ -190,15 +183,13 @@
}
static void
-system_restart_auth_cb (PolKitAction *action,
- gboolean gained_privilege,
- GError *error,
- DBusGProxy *proxy)
+system_restart_auth_cb (PolKitAction *action, gboolean gained_privilege,
+ GError *error, DBusGProxy *proxy)
{
- GError *local_error;
- gboolean res;
+ GError *local_error;
+ gboolean res;
- if (! gained_privilege) {
+ if (!gained_privilege) {
if (error != NULL) {
pk_warning ("Not privileged to restart system: %s", error->message);
}
@@ -207,33 +198,31 @@
local_error = NULL;
res = try_system_restart (proxy, &local_error);
- if (! res) {
+ if (!res) {
pk_warning ("Unable to restart system: %s", local_error->message);
g_error_free (local_error);
}
}
static gboolean
-request_restart_priv (DBusGProxy *proxy,
- PolKitAction *action,
- GError **error)
+request_restart_priv (DBusGProxy *proxy, PolKitAction *action, GError **error)
{
- guint xid;
- pid_t pid;
+ guint xid;
+ pid_t pid;
xid = 0;
pid = getpid ();
- return polkit_gnome_auth_obtain (action,
- xid,
- pid,
+ return polkit_gnome_auth_obtain (action, xid, pid,
(PolKitGnomeAuthCB) system_restart_auth_cb,
- proxy,
- error);
+ proxy, error);
}
+/**
+ * gpk_restart_system:
+ **/
gboolean
-pk_restart_system (void)
+gpk_restart_system (void)
{
DBusGProxy *proxy;
DBusGConnection *connection;
@@ -280,10 +269,10 @@
}
/**
- * pk_execute_url:
+ * gpk_execute_url:
**/
gboolean
-pk_execute_url (const gchar *url)
+gpk_execute_url (const gchar *url)
{
gchar *data;
gboolean ret;
@@ -300,11 +289,11 @@
}
/**
- * pk_show_help:
+ * gpk_show_help:
* @link_id: Subsection of gnome-packagekit help file, or NULL.
**/
gboolean
-pk_show_help (const gchar *link_id)
+gpk_show_help (const gchar *link_id)
{
GError *error = NULL;
gchar *command;
@@ -341,7 +330,7 @@
if (error != NULL) {
GtkWidget *d;
d = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, error->message);
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", error->message);
gtk_dialog_run (GTK_DIALOG(d));
gtk_widget_destroy (d);
g_error_free (error);
@@ -354,10 +343,10 @@
}
/**
- * pk_size_to_si_size_text:
+ * gpk_size_to_si_size_text:
**/
gchar *
-pk_size_to_si_size_text (guint64 size)
+gpk_size_to_si_size_text (guint64 size)
{
gdouble frac;
@@ -389,10 +378,10 @@
}
/**
- * pk_package_id_pretty:
+ * gpk_package_id_pretty:
**/
gchar *
-pk_package_id_pretty (const gchar *package_id, const gchar *summary)
+gpk_package_id_pretty (const gchar *package_id, const gchar *summary)
{
PkPackageId *ident;
gchar *text;
@@ -426,10 +415,10 @@
}
/**
- * pk_package_id_pretty_oneline:
+ * gpk_package_id_pretty_oneline:
**/
gchar *
-pk_package_id_pretty_oneline (const gchar *package_id, const gchar *summary)
+gpk_package_id_pretty_oneline (const gchar *package_id, const gchar *summary)
{
PkPackageId *ident;
gchar *text;
@@ -452,10 +441,10 @@
}
/**
- * pk_package_id_name_version:
+ * gpk_package_id_name_version:
**/
gchar *
-pk_package_id_name_version (const gchar *package_id)
+gpk_package_id_name_version (const gchar *package_id)
{
PkPackageId *ident;
gchar *text;
@@ -481,7 +470,7 @@
* pk_package_id_get_name:
**/
gchar *
-pk_package_get_name (const gchar *package_id)
+gpk_package_get_name (const gchar *package_id)
{
gchar *package = NULL;
PkPackageId *ident;
@@ -503,12 +492,12 @@
}
/**
- * pk_icon_valid:
+ * gpk_icon_valid:
*
* Check icon actually exists and is valid in this theme
**/
gboolean
-pk_icon_valid (const gchar *icon)
+gpk_icon_valid (const gchar *icon)
{
GtkIconInfo *icon_info;
GtkIconTheme *icon_theme;
@@ -535,27 +524,27 @@
}
/**
- * pk_error_modal_dialog:
+ * gpk_error_modal_dialog:
*
* Shows a modal error, and blocks until the user clicks close
**/
gboolean
-pk_error_modal_dialog (const gchar *title, const gchar *message)
+gpk_error_modal_dialog (const gchar *title, const gchar *message)
{
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, title);
- gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), message);
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, "%s", title);
+ gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", message);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
return TRUE;
}
/**
- * pk_error_enum_to_localised_text:
+ * gpk_error_enum_to_localised_text:
**/
const gchar *
-pk_error_enum_to_localised_text (PkErrorCodeEnum code)
+gpk_error_enum_to_localised_text (PkErrorCodeEnum code)
{
const gchar *text = NULL;
switch (code) {
@@ -614,16 +603,16 @@
text = _("Could not remove a protected system package");
break;
case PK_ERROR_ENUM_TRANSACTION_CANCELLED:
- text = _("The transaction was canceled");
+ text = _("The task was canceled");
break;
case PK_ERROR_ENUM_PROCESS_KILL:
- text = _("The transaction was forcibly canceled");
+ text = _("The task was forcibly canceled");
break;
case PK_ERROR_ENUM_FAILED_CONFIG_PARSING:
text = _("Reading the config file failed");
break;
case PK_ERROR_ENUM_CANNOT_CANCEL:
- text = _("The transaction cannot be cancelled");
+ text = _("The task cannot be cancelled");
break;
case PK_ERROR_ENUM_CANNOT_INSTALL_SOURCE_PACKAGE:
text = _("Source packages cannot be installed");
@@ -635,10 +624,10 @@
}
/**
- * pk_error_enum_to_localised_message:
+ * gpk_error_enum_to_localised_message:
**/
const gchar *
-pk_error_enum_to_localised_message (PkErrorCodeEnum code)
+gpk_error_enum_to_localised_message (PkErrorCodeEnum code)
{
const gchar *text = NULL;
switch (code) {
@@ -687,7 +676,7 @@
"Please check your group list and try again.");
break;
case PK_ERROR_ENUM_DEP_RESOLUTION_FAILED:
- text = _("A package could not be found that allows the transaction to complete.\n"
+ text = _("A package could not be found that allows the task to complete.\n"
"More information is available in the detailed report.");
break;
case PK_ERROR_ENUM_FILTER_INVALID:
@@ -698,7 +687,7 @@
"This normally indicates an internal error and should be reported.");
break;
case PK_ERROR_ENUM_TRANSACTION_ERROR:
- text = _("An unspecified transaction error has occurred.\n"
+ text = _("An unspecified task error has occurred.\n"
"More information is available in the detailed report.");
break;
case PK_ERROR_ENUM_REPO_NOT_FOUND:
@@ -709,10 +698,10 @@
text = _("Removing a protected system package is not alloed.");
break;
case PK_ERROR_ENUM_TRANSACTION_CANCELLED:
- text = _("The transaction was canceled successfully and no packages were changed.");
+ text = _("The task was canceled successfully and no packages were changed.");
break;
case PK_ERROR_ENUM_PROCESS_KILL:
- text = _("The transaction was canceled successfully and no packages were changed.\n"
+ text = _("The task was canceled successfully and no packages were changed.\n"
"The backend did not exit cleanly.");
break;
case PK_ERROR_ENUM_FAILED_CONFIG_PARSING:
@@ -720,7 +709,7 @@
"Please make sure configuration is valid.");
break;
case PK_ERROR_ENUM_CANNOT_CANCEL:
- text = _("The transaction is not safe to be cancelled at this time.");
+ text = _("The task is not safe to be cancelled at this time.");
break;
case PK_ERROR_ENUM_CANNOT_INSTALL_SOURCE_PACKAGE:
text = _("Source packages are not normally installed this way.\n"
@@ -734,10 +723,10 @@
}
/**
- * pk_restart_enum_to_localised_text_future:
+ * gpk_restart_enum_to_localised_text_future:
**/
const gchar *
-pk_restart_enum_to_localised_text_future (PkRestartEnum restart)
+gpk_restart_enum_to_localised_text_future (PkRestartEnum restart)
{
const gchar *text = NULL;
switch (restart) {
@@ -760,10 +749,10 @@
}
/**
- * pk_restart_enum_to_localised_text:
+ * gpk_restart_enum_to_localised_text:
**/
const gchar *
-pk_restart_enum_to_localised_text (PkRestartEnum restart)
+gpk_restart_enum_to_localised_text (PkRestartEnum restart)
{
const gchar *text = NULL;
switch (restart) {
@@ -786,18 +775,18 @@
}
/**
- * pk_message_enum_to_localised_text:
+ * gpk_message_enum_to_localised_text:
**/
const gchar *
-pk_message_enum_to_localised_text (PkMessageEnum message)
+gpk_message_enum_to_localised_text (PkMessageEnum message)
{
const gchar *text = NULL;
switch (message) {
case PK_MESSAGE_ENUM_NOTICE:
- text = _("PackageKit transaction notice");
+ text = _("PackageKit notice");
break;
case PK_MESSAGE_ENUM_WARNING:
- text = _("PackageKit transaction warning");
+ text = _("PackageKit warning");
break;
case PK_MESSAGE_ENUM_DAEMON:
text = _("PackageKit daemon");
@@ -809,10 +798,10 @@
}
/**
- * pk_status_enum_to_localised_text:
+ * gpk_status_enum_to_localised_text:
**/
const gchar *
-pk_status_enum_to_localised_text (PkStatusEnum status)
+gpk_status_enum_to_localised_text (PkStatusEnum status)
{
const gchar *text = NULL;
switch (status) {
@@ -826,7 +815,7 @@
text = _("Waiting for other tasks to complete");
break;
case PK_STATUS_ENUM_RUNNING:
- text = _("Running transaction");
+ text = _("Running task");
break;
case PK_STATUS_ENUM_QUERY:
text = _("Querying");
@@ -865,10 +854,10 @@
text = _("Rolling back");
break;
case PK_STATUS_ENUM_TEST_COMMIT:
- text = _("Trying transaction");
+ text = _("Testing changes");
break;
case PK_STATUS_ENUM_COMMIT:
- text = _("Committing transaction");
+ text = _("Committing changes");
break;
case PK_STATUS_ENUM_REQUEST:
text = _("Requesting data");
@@ -886,10 +875,10 @@
}
/**
- * pk_update_enum_to_localised_text:
+ * gpk_update_enum_to_localised_text:
**/
gchar *
-pk_update_enum_to_localised_text (PkInfoEnum info, guint number)
+gpk_update_enum_to_localised_text (PkInfoEnum info, guint number)
{
gchar *text = NULL;
switch (info) {
@@ -918,10 +907,10 @@
}
/**
- * pk_info_enum_to_localised_text:
+ * gpk_info_enum_to_localised_text:
**/
const gchar *
-pk_info_enum_to_localised_text (PkInfoEnum info)
+gpk_info_enum_to_localised_text (PkInfoEnum info)
{
const gchar *text = NULL;
switch (info) {
@@ -977,10 +966,10 @@
}
/**
- * pk_role_enum_to_localised_present:
+ * gpk_role_enum_to_localised_present:
**/
const gchar *
-pk_role_enum_to_localised_present (PkRoleEnum role)
+gpk_role_enum_to_localised_present (PkRoleEnum role)
{
const gchar *text = NULL;
switch (role) {
@@ -1066,12 +1055,12 @@
}
/**
- * pk_role_enum_to_localised_past:
+ * gpk_role_enum_to_localised_past:
*
* These are past tense versions of the action
**/
const gchar *
-pk_role_enum_to_localised_past (PkRoleEnum role)
+gpk_role_enum_to_localised_past (PkRoleEnum role)
{
const gchar *text = NULL;
switch (role) {
@@ -1157,10 +1146,10 @@
}
/**
- * pk_group_enum_to_localised_text:
+ * gpk_group_enum_to_localised_text:
**/
const gchar *
-pk_group_enum_to_localised_text (PkGroupEnum group)
+gpk_group_enum_to_localised_text (PkGroupEnum group)
{
const gchar *text = NULL;
switch (group) {
@@ -1258,61 +1247,61 @@
}
/**
- * pk_info_enum_to_icon_name:
+ * gpk_info_enum_to_icon_name:
**/
const gchar *
-pk_info_enum_to_icon_name (PkInfoEnum info)
+gpk_info_enum_to_icon_name (PkInfoEnum info)
{
return pk_enum_find_string (enum_info_icon_name, info);
}
/**
- * pk_status_enum_to_icon_name:
+ * gpk_status_enum_to_icon_name:
**/
const gchar *
-pk_status_enum_to_icon_name (PkStatusEnum status)
+gpk_status_enum_to_icon_name (PkStatusEnum status)
{
return pk_enum_find_string (enum_status_icon_name, status);
}
/**
- * pk_role_enum_to_icon_name:
+ * gpk_role_enum_to_icon_name:
**/
const gchar *
-pk_role_enum_to_icon_name (PkRoleEnum role)
+gpk_role_enum_to_icon_name (PkRoleEnum role)
{
return pk_enum_find_string (enum_role_icon_name, role);
}
/**
- * pk_group_enum_to_icon_name:
+ * gpk_group_enum_to_icon_name:
**/
const gchar *
-pk_group_enum_to_icon_name (PkGroupEnum group)
+gpk_group_enum_to_icon_name (PkGroupEnum group)
{
return pk_enum_find_string (enum_group_icon_name, group);
}
/**
- * pk_restart_enum_to_icon_name:
+ * gpk_restart_enum_to_icon_name:
**/
const gchar *
-pk_restart_enum_to_icon_name (PkRestartEnum restart)
+gpk_restart_enum_to_icon_name (PkRestartEnum restart)
{
return pk_enum_find_string (enum_restart_icon_name, restart);
}
/**
- * pk_message_enum_to_icon_name:
+ * gpk_message_enum_to_icon_name:
**/
const gchar *
-pk_message_enum_to_icon_name (PkMessageEnum message)
+gpk_message_enum_to_icon_name (PkMessageEnum message)
{
return pk_enum_find_string (enum_message_icon_name, message);
}
/**
- * pk_time_to_localised_string:
+ * gpk_time_to_localised_string:
* @time_secs: The time value to convert in seconds
* @cookie: The cookie we are looking for
*
@@ -1321,7 +1310,7 @@
* Return value: The time string, e.g. "2 hours 3 minutes"
**/
gchar *
-pk_time_to_localised_string (guint time_secs)
+gpk_time_to_localised_string (guint time_secs)
{
gchar* timestring = NULL;
guint hours;
@@ -1404,7 +1393,7 @@
**************** time text **************
************************************************************/
libst_title (test, "time zero");
- text = pk_time_to_localised_string (0);
+ text = gpk_time_to_localised_string (0);
if (text != NULL && strcmp (text, _("Now")) == 0) {
libst_success (test, NULL);
} else {
@@ -1414,7 +1403,7 @@
/************************************************************/
libst_title (test, "time 1s");
- text = pk_time_to_localised_string (1);
+ text = gpk_time_to_localised_string (1);
if (text != NULL && strcmp (text, _("1 second")) == 0) {
libst_success (test, NULL);
} else {
@@ -1424,7 +1413,7 @@
/************************************************************/
libst_title (test, "time 1m");
- text = pk_time_to_localised_string (1*60);
+ text = gpk_time_to_localised_string (1*60);
if (text != NULL && strcmp (text, _("1 minute")) == 0) {
libst_success (test, NULL);
} else {
@@ -1434,7 +1423,7 @@
/************************************************************/
libst_title (test, "time 1h");
- text = pk_time_to_localised_string (1*60*60);
+ text = gpk_time_to_localised_string (1*60*60);
if (text != NULL && strcmp (text, _("1 hour")) == 0) {
libst_success (test, NULL);
} else {
@@ -1444,7 +1433,7 @@
/************************************************************/
libst_title (test, "time 30s");
- text = pk_time_to_localised_string (30);
+ text = gpk_time_to_localised_string (30);
if (text != NULL && strcmp (text, _("30 seconds")) == 0) {
libst_success (test, NULL);
} else {
@@ -1454,7 +1443,7 @@
/************************************************************/
libst_title (test, "time 30m");
- text = pk_time_to_localised_string (30*60);
+ text = gpk_time_to_localised_string (30*60);
if (text != NULL && strcmp (text, _("30 minutes")) == 0) {
libst_success (test, NULL);
} else {
@@ -1464,7 +1453,7 @@
/************************************************************/
libst_title (test, "time 30m1s");
- text = pk_time_to_localised_string (30*60+1);
+ text = gpk_time_to_localised_string (30*60+1);
if (text != NULL && strcmp (text, _("30 minutes 1 second")) == 0) {
libst_success (test, NULL);
} else {
@@ -1474,7 +1463,7 @@
/************************************************************/
libst_title (test, "time 30m10s");
- text = pk_time_to_localised_string (30*60+10);
+ text = gpk_time_to_localised_string (30*60+10);
if (text != NULL && strcmp (text, _("30 minutes 10 seconds")) == 0) {
libst_success (test, NULL);
} else {
@@ -1486,7 +1475,7 @@
**************** size text **************
************************************************************/
libst_title (test, "size zero");
- text = pk_size_to_si_size_text (0);
+ text = gpk_size_to_si_size_text (0);
if (text != NULL && strcmp (text, _("0 bytes")) == 0) {
libst_success (test, NULL);
} else {
@@ -1496,7 +1485,7 @@
/************************************************************/
libst_title (test, "size 512 bytes");
- text = pk_size_to_si_size_text (512);
+ text = gpk_size_to_si_size_text (512);
if (text != NULL && strcmp (text, _("512 bytes")) == 0) {
libst_success (test, NULL);
} else {
@@ -1506,7 +1495,7 @@
/************************************************************/
libst_title (test, "size 256.2 MB");
- text = pk_size_to_si_size_text (256*1025*1024);
+ text = gpk_size_to_si_size_text (256*1025*1024);
if (text != NULL && strcmp (text, _("256.2 MB")) == 0) {
libst_success (test, NULL);
} else {
@@ -1518,7 +1507,7 @@
**************** package name text **************
************************************************************/
libst_title (test, "get name null");
- text = pk_package_get_name (NULL);
+ text = gpk_package_get_name (NULL);
if (text != NULL && strcmp (text, _("Package identifier not valid")) == 0) {
libst_success (test, NULL);
} else {
@@ -1528,7 +1517,7 @@
/************************************************************/
libst_title (test, "get name not id");
- text = pk_package_get_name ("ania");
+ text = gpk_package_get_name ("ania");
if (text != NULL && strcmp (text, "ania") == 0) {
libst_success (test, NULL);
} else {
@@ -1538,7 +1527,7 @@
/************************************************************/
libst_title (test, "get name just id");
- text = pk_package_get_name ("simon;1.0.0;i386;moo");
+ text = gpk_package_get_name ("simon;1.0.0;i386;moo");
if (text != NULL && strcmp (text, "simon") == 0) {
libst_success (test, NULL);
} else {
@@ -1550,7 +1539,7 @@
**************** package name text **************
************************************************************/
libst_title (test, "package id pretty null");
- text = pk_package_id_pretty (NULL, NULL);
+ text = gpk_package_id_pretty (NULL, NULL);
if (text != NULL && strcmp (text, _("Package identifier not valid")) == 0) {
libst_success (test, NULL);
} else {
@@ -1560,7 +1549,7 @@
/************************************************************/
libst_title (test, "package id pretty valid package id, no summary");
- text = pk_package_id_pretty ("simon;0.0.1;i386;data", NULL);
+ text = gpk_package_id_pretty ("simon;0.0.1;i386;data", NULL);
if (text != NULL && strcmp (text, "<b>simon-0.0.1 (i386)</b>") == 0) {
libst_success (test, NULL);
} else {
@@ -1570,7 +1559,7 @@
/************************************************************/
libst_title (test, "package id pretty valid package id, no summary 2");
- text = pk_package_id_pretty ("simon;0.0.1;;data", NULL);
+ text = gpk_package_id_pretty ("simon;0.0.1;;data", NULL);
if (text != NULL && strcmp (text, "<b>simon-0.0.1</b>") == 0) {
libst_success (test, NULL);
} else {
@@ -1580,7 +1569,7 @@
/************************************************************/
libst_title (test, "package id pretty valid package id, no summary 3");
- text = pk_package_id_pretty ("simon;;;data", NULL);
+ text = gpk_package_id_pretty ("simon;;;data", NULL);
if (text != NULL && strcmp (text, "<b>simon</b>") == 0) {
libst_success (test, NULL);
} else {
@@ -1590,7 +1579,7 @@
/************************************************************/
libst_title (test, "package id pretty valid package id, no summary 4");
- text = pk_package_id_pretty ("simon;0.0.1;;data", "dude");
+ text = gpk_package_id_pretty ("simon;0.0.1;;data", "dude");
if (text != NULL && strcmp (text, "<b>simon-0.0.1</b>\ndude") == 0) {
libst_success (test, NULL);
} else {
@@ -1603,7 +1592,7 @@
************************************************************/
libst_title (test, "check we convert all the localised past role enums");
for (i=0; i<PK_ROLE_ENUM_UNKNOWN; i++) {
- string = pk_role_enum_to_localised_past (i);
+ string = gpk_role_enum_to_localised_past (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1614,7 +1603,7 @@
/************************************************************/
libst_title (test, "check we convert all the localised present role enums");
for (i=0; i<PK_ROLE_ENUM_UNKNOWN; i++) {
- string = pk_role_enum_to_localised_present (i);
+ string = gpk_role_enum_to_localised_present (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1625,7 +1614,7 @@
/************************************************************/
libst_title (test, "check we convert all the role icon name enums");
for (i=0; i<PK_ROLE_ENUM_UNKNOWN; i++) {
- string = pk_role_enum_to_icon_name (i);
+ string = gpk_role_enum_to_icon_name (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1636,7 +1625,7 @@
/************************************************************/
libst_title (test, "check we convert all the localised info enums");
for (i=0; i<PK_INFO_ENUM_UNKNOWN; i++) {
- string = pk_info_enum_to_localised_text (i);
+ string = gpk_info_enum_to_localised_text (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1647,7 +1636,7 @@
/************************************************************/
libst_title (test, "check we convert all the info icon names enums");
for (i=0; i<PK_INFO_ENUM_UNKNOWN; i++) {
- string = pk_info_enum_to_icon_name (i);
+ string = gpk_info_enum_to_icon_name (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1658,7 +1647,7 @@
/************************************************************/
libst_title (test, "check we convert all the localised status enums");
for (i=0; i<PK_STATUS_ENUM_UNKNOWN; i++) {
- string = pk_status_enum_to_localised_text (i);
+ string = gpk_status_enum_to_localised_text (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1669,7 +1658,7 @@
/************************************************************/
libst_title (test, "check we convert all the status icon names enums");
for (i=0; i<PK_STATUS_ENUM_UNKNOWN; i++) {
- string = pk_status_enum_to_icon_name (i);
+ string = gpk_status_enum_to_icon_name (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1680,7 +1669,7 @@
/************************************************************/
libst_title (test, "check we convert all the restart icon names enums");
for (i=0; i<PK_RESTART_ENUM_UNKNOWN; i++) {
- string = pk_restart_enum_to_icon_name (i);
+ string = gpk_restart_enum_to_icon_name (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1691,7 +1680,7 @@
/************************************************************/
libst_title (test, "check we convert all the localised error enums");
for (i=0; i<PK_ERROR_ENUM_UNKNOWN; i++) {
- string = pk_error_enum_to_localised_text (i);
+ string = gpk_error_enum_to_localised_text (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1702,7 +1691,7 @@
/************************************************************/
libst_title (test, "check we convert all the localised error enums");
for (i=0; i<PK_ERROR_ENUM_UNKNOWN; i++) {
- string = pk_error_enum_to_localised_message (i);
+ string = gpk_error_enum_to_localised_message (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1713,7 +1702,7 @@
/************************************************************/
libst_title (test, "check we convert all the localised restart enums");
for (i=0; i<PK_RESTART_ENUM_UNKNOWN; i++) {
- string = pk_restart_enum_to_localised_text (i);
+ string = gpk_restart_enum_to_localised_text (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1724,7 +1713,7 @@
/************************************************************/
libst_title (test, "check we convert all the message icon name enums");
for (i=0; i<PK_MESSAGE_ENUM_UNKNOWN; i++) {
- string = pk_message_enum_to_icon_name (i);
+ string = gpk_message_enum_to_icon_name (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1735,7 +1724,7 @@
/************************************************************/
libst_title (test, "check we convert all the localised message enums");
for (i=0; i<PK_MESSAGE_ENUM_UNKNOWN; i++) {
- string = pk_message_enum_to_localised_text (i);
+ string = gpk_message_enum_to_localised_text (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1746,7 +1735,7 @@
/************************************************************/
libst_title (test, "check we convert all the localised restart future enums");
for (i=0; i<PK_RESTART_ENUM_UNKNOWN; i++) {
- string = pk_restart_enum_to_localised_text_future (i);
+ string = gpk_restart_enum_to_localised_text_future (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1757,7 +1746,7 @@
/************************************************************/
libst_title (test, "check we convert all the localised group enums");
for (i=0; i<PK_GROUP_ENUM_UNKNOWN; i++) {
- string = pk_group_enum_to_localised_text (i);
+ string = gpk_group_enum_to_localised_text (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
@@ -1768,7 +1757,7 @@
/************************************************************/
libst_title (test, "check we convert all the group icon name enums");
for (i=0; i<PK_GROUP_ENUM_UNKNOWN; i++) {
- string = pk_group_enum_to_icon_name (i);
+ string = gpk_group_enum_to_icon_name (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
break;
Modified: trunk/src/gpk-common.h
==============================================================================
--- trunk/src/gpk-common.h (original)
+++ trunk/src/gpk-common.h Tue Apr 1 23:21:47 2008
@@ -27,66 +27,69 @@
G_BEGIN_DECLS
-#define PK_PROGRESS_BAR_PULSE_DELAY 50
-#define PK_PROGRESS_BAR_PULSE_STEP 0.05
+#define GPK_PROGRESS_BAR_PULSE_DELAY 50
+#define GPK_PROGRESS_BAR_PULSE_STEP 0.05
-#define PK_CONF_NOTIFY_COMPLETED "/apps/gnome-packagekit/notify_complete"
-#define PK_CONF_NOTIFY_AVAILABLE "/apps/gnome-packagekit/notify_available"
-#define PK_CONF_NOTIFY_CRITICAL "/apps/gnome-packagekit/notify_critical"
-#define PK_CONF_NOTIFY_ERROR "/apps/gnome-packagekit/notify_errors"
-#define PK_CONF_NOTIFY_MESSAGE "/apps/gnome-packagekit/notify_message"
-#define PK_CONF_NOTIFY_STARTED "/apps/gnome-packagekit/notify_started"
-#define PK_CONF_NOTIFY_BATTERY_UPDATE "/apps/gnome-packagekit/notify_battery_update"
-#define PK_CONF_NOTIFY_RESTART "/apps/gnome-packagekit/notify_restart"
-#define PK_CONF_AUTOCOMPLETE "/apps/gnome-packagekit/autocomplete"
-#define PK_CONF_SESSION_STARTUP_TIMEOUT "/apps/gnome-packagekit/session_startup_timeout"
-#define PK_CONF_FREQUENCY_GET_UPDATES "/apps/gnome-packagekit/frequency_get_updates"
-#define PK_CONF_FREQUENCY_REFRESH_CACHE "/apps/gnome-packagekit/frequency_refresh_cache"
-#define PK_CONF_AUTO_UPDATE "/apps/gnome-packagekit/auto_update"
-#define PK_CONF_UPDATE_BATTERY "/apps/gnome-packagekit/update_battery"
-
-#define GS_DBUS_SERVICE "org.gnome.ScreenSaver"
-#define GS_DBUS_PATH "/org/gnome/ScreenSaver"
-#define GS_DBUS_INTERFACE "org.gnome.ScreenSaver"
-
-#define GPM_DBUS_SERVICE "org.freedesktop.PowerManagement"
-#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement"
-#define GPM_DBUS_PATH_INHIBIT "/org/freedesktop/PowerManagement/Inhibit"
-#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement"
-#define GPM_DBUS_INTERFACE_INHIBIT "org.freedesktop.PowerManagement.Inhibit"
+#define GPK_CONF_NOTIFY_COMPLETED "/apps/gnome-packagekit/notify_complete"
+#define GPK_CONF_NOTIFY_AVAILABLE "/apps/gnome-packagekit/notify_available"
+#define GPK_CONF_NOTIFY_CRITICAL "/apps/gnome-packagekit/notify_critical"
+#define GPK_CONF_NOTIFY_ERROR "/apps/gnome-packagekit/notify_errors"
+#define GPK_CONF_NOTIFY_MESSAGE "/apps/gnome-packagekit/notify_message"
+#define GPK_CONF_NOTIFY_STARTED "/apps/gnome-packagekit/notify_started"
+#define GPK_CONF_NOTIFY_BATTERY_UPDATE "/apps/gnome-packagekit/notify_battery_update"
+#define GPK_CONF_NOTIFY_RESTART "/apps/gnome-packagekit/notify_restart"
+#define GPK_CONF_AUTOCOMPLETE "/apps/gnome-packagekit/autocomplete"
+#define GPK_CONF_SESSION_STARTUP_TIMEOUT "/apps/gnome-packagekit/session_startup_timeout"
+#define GPK_CONF_FREQUENCY_GET_UPDATES "/apps/gnome-packagekit/frequency_get_updates"
+#define GPK_CONF_FREQUENCY_REFRESH_CACHE "/apps/gnome-packagekit/frequency_refresh_cache"
+#define GPK_CONF_AUTO_UPDATE "/apps/gnome-packagekit/auto_update"
+#define GPK_CONF_UPDATE_BATTERY "/apps/gnome-packagekit/update_battery"
+
+#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 GS_DBUS_SERVICE "org.gnome.ScreenSaver"
+#define GS_DBUS_PATH "/org/gnome/ScreenSaver"
+#define GS_DBUS_INTERFACE "org.gnome.ScreenSaver"
+
+#define GPM_DBUS_SERVICE "org.freedesktop.PowerManagement"
+#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement"
+#define GPM_DBUS_PATH_INHIBIT "/org/freedesktop/PowerManagement/Inhibit"
+#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement"
+#define GPM_DBUS_INTERFACE_INHIBIT "org.freedesktop.PowerManagement.Inhibit"
-gchar *pk_package_get_name (const gchar *package_id);
-gchar *pk_package_id_pretty (const gchar *package_id,
+gchar *gpk_package_get_name (const gchar *package_id);
+gchar *gpk_package_id_pretty (const gchar *package_id,
const gchar *summary);
-gchar *pk_package_id_pretty_oneline (const gchar *package_id,
+gchar *gpk_package_id_pretty_oneline (const gchar *package_id,
const gchar *summary);
-gchar *pk_package_id_name_version (const gchar *package_id);
-gboolean pk_icon_valid (const gchar *icon);
-gboolean pk_error_modal_dialog (const gchar *title,
+gchar *gpk_package_id_name_version (const gchar *package_id);
+gboolean gpk_icon_valid (const gchar *icon);
+gboolean gpk_error_modal_dialog (const gchar *title,
const gchar *message);
-gboolean pk_execute_url (const gchar *url);
-gboolean pk_show_help (const gchar *link_id);
-gboolean pk_restart_system (void);
-const gchar *pk_role_enum_to_localised_past (PkRoleEnum role);
-const gchar *pk_role_enum_to_localised_present (PkRoleEnum role);
-const gchar *pk_role_enum_to_icon_name (PkRoleEnum role);
-const gchar *pk_info_enum_to_localised_text (PkInfoEnum info);
-const gchar *pk_info_enum_to_icon_name (PkInfoEnum info);
-const gchar *pk_status_enum_to_localised_text (PkStatusEnum status);
-const gchar *pk_status_enum_to_icon_name (PkStatusEnum status);
-const gchar *pk_restart_enum_to_icon_name (PkRestartEnum restart);
-const gchar *pk_error_enum_to_localised_text (PkErrorCodeEnum code);
-const gchar *pk_error_enum_to_localised_message (PkErrorCodeEnum code);
-const gchar *pk_restart_enum_to_localised_text (PkRestartEnum restart);
-const gchar *pk_message_enum_to_icon_name (PkMessageEnum message);
-const gchar *pk_message_enum_to_localised_text (PkMessageEnum message);
-const gchar *pk_restart_enum_to_localised_text_future(PkRestartEnum restart);
-const gchar *pk_group_enum_to_localised_text (PkGroupEnum group);
-const gchar *pk_group_enum_to_icon_name (PkGroupEnum group);
-gchar *pk_size_to_si_size_text (guint64 size);
-gchar *pk_update_enum_to_localised_text (PkInfoEnum info,
+gboolean gpk_execute_url (const gchar *url);
+gboolean gpk_show_help (const gchar *link_id);
+gboolean gpk_restart_system (void);
+const gchar *gpk_role_enum_to_localised_past (PkRoleEnum role);
+const gchar *gpk_role_enum_to_localised_present (PkRoleEnum role);
+const gchar *gpk_role_enum_to_icon_name (PkRoleEnum role);
+const gchar *gpk_info_enum_to_localised_text (PkInfoEnum info);
+const gchar *gpk_info_enum_to_icon_name (PkInfoEnum info);
+const gchar *gpk_status_enum_to_localised_text (PkStatusEnum status);
+const gchar *gpk_status_enum_to_icon_name (PkStatusEnum status);
+const gchar *gpk_restart_enum_to_icon_name (PkRestartEnum restart);
+const gchar *gpk_error_enum_to_localised_text (PkErrorCodeEnum code);
+const gchar *gpk_error_enum_to_localised_message (PkErrorCodeEnum code);
+const gchar *gpk_restart_enum_to_localised_text (PkRestartEnum restart);
+const gchar *gpk_message_enum_to_icon_name (PkMessageEnum message);
+const gchar *gpk_message_enum_to_localised_text (PkMessageEnum message);
+const gchar *gpk_restart_enum_to_localised_text_future(PkRestartEnum restart);
+const gchar *gpk_group_enum_to_localised_text (PkGroupEnum group);
+const gchar *gpk_group_enum_to_icon_name (PkGroupEnum group);
+gchar *gpk_size_to_si_size_text (guint64 size);
+gchar *gpk_update_enum_to_localised_text (PkInfoEnum info,
guint number);
-gchar *pk_time_to_localised_string (guint time_secs);
+gchar *gpk_time_to_localised_string (guint time_secs);
G_END_DECLS
Modified: trunk/src/gpk-inhibit.c
==============================================================================
--- trunk/src/gpk-inhibit.c (original)
+++ trunk/src/gpk-inhibit.c Tue Apr 1 23:21:47 2008
@@ -41,37 +41,37 @@
#include "gpk-inhibit.h"
#include "gpk-common.h"
-static void pk_inhibit_class_init (PkInhibitClass *klass);
-static void pk_inhibit_init (PkInhibit *inhibit);
-static void pk_inhibit_finalize (GObject *object);
+static void gpk_inhibit_class_init (GpkInhibitClass *klass);
+static void gpk_inhibit_init (GpkInhibit *inhibit);
+static void gpk_inhibit_finalize (GObject *object);
-#define PK_INHIBIT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PK_TYPE_INHIBIT, PkInhibitPrivate))
+#define GPK_INHIBIT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPK_TYPE_INHIBIT, GpkInhibitPrivate))
-struct PkInhibitPrivate
+struct GpkInhibitPrivate
{
DBusGProxy *proxy_gpm;
guint cookie;
};
-G_DEFINE_TYPE (PkInhibit, pk_inhibit, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GpkInhibit, gpk_inhibit, G_TYPE_OBJECT)
/**
- * pk_inhibit_class_init:
- * @klass: The PkInhibitClass
+ * gpk_inhibit_class_init:
+ * @klass: The GpkInhibitClass
**/
static void
-pk_inhibit_class_init (PkInhibitClass *klass)
+gpk_inhibit_class_init (GpkInhibitClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = pk_inhibit_finalize;
- g_type_class_add_private (klass, sizeof (PkInhibitPrivate));
+ object_class->finalize = gpk_inhibit_finalize;
+ g_type_class_add_private (klass, sizeof (GpkInhibitPrivate));
}
/**
- * pk_inhibit_create:
+ * gpk_inhibit_create:
**/
gboolean
-pk_inhibit_create (PkInhibit *inhibit)
+gpk_inhibit_create (GpkInhibit *inhibit)
{
gboolean ret;
GError *error = NULL;
@@ -105,10 +105,10 @@
}
/**
- * pk_inhibit_remove:
+ * gpk_inhibit_remove:
**/
gboolean
-pk_inhibit_remove (PkInhibit *inhibit)
+gpk_inhibit_remove (GpkInhibit *inhibit)
{
gboolean ret;
GError *error = NULL;
@@ -141,15 +141,15 @@
}
/**
- * pk_inhibit_init:
+ * gpk_inhibit_init:
* @inhibit: This class instance
**/
static void
-pk_inhibit_init (PkInhibit *inhibit)
+gpk_inhibit_init (GpkInhibit *inhibit)
{
DBusGConnection *connection;
GError *error = NULL;
- inhibit->priv = PK_INHIBIT_GET_PRIVATE (inhibit);
+ inhibit->priv = GPK_INHIBIT_GET_PRIVATE (inhibit);
inhibit->priv->cookie = 0;
/* connect to session bus */
@@ -171,35 +171,35 @@
}
/**
- * pk_inhibit_finalize:
+ * gpk_inhibit_finalize:
* @object: The object to finalize
**/
static void
-pk_inhibit_finalize (GObject *object)
+gpk_inhibit_finalize (GObject *object)
{
- PkInhibit *inhibit;
+ GpkInhibit *inhibit;
g_return_if_fail (object != NULL);
g_return_if_fail (PK_IS_INHIBIT (object));
- inhibit = PK_INHIBIT (object);
+ inhibit = GPK_INHIBIT (object);
g_return_if_fail (inhibit->priv != NULL);
g_object_unref (inhibit->priv->proxy_gpm);
- G_OBJECT_CLASS (pk_inhibit_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gpk_inhibit_parent_class)->finalize (object);
}
/**
- * pk_inhibit_new:
+ * gpk_inhibit_new:
*
- * Return value: a new PkInhibit object.
+ * Return value: a new GpkInhibit object.
**/
-PkInhibit *
-pk_inhibit_new (void)
+GpkInhibit *
+gpk_inhibit_new (void)
{
- PkInhibit *inhibit;
- inhibit = g_object_new (PK_TYPE_INHIBIT, NULL);
- return PK_INHIBIT (inhibit);
+ GpkInhibit *inhibit;
+ inhibit = g_object_new (GPK_TYPE_INHIBIT, NULL);
+ return GPK_INHIBIT (inhibit);
}
Modified: trunk/src/gpk-inhibit.h
==============================================================================
--- trunk/src/gpk-inhibit.h (original)
+++ trunk/src/gpk-inhibit.h Tue Apr 1 23:21:47 2008
@@ -19,40 +19,40 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __PK_INHIBIT_H
-#define __PK_INHIBIT_H
+#ifndef __GPK_INHIBIT_H
+#define __GPK_INHIBIT_H
#include <glib-object.h>
G_BEGIN_DECLS
-#define PK_TYPE_INHIBIT (pk_inhibit_get_type ())
-#define PK_INHIBIT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PK_TYPE_INHIBIT, PkInhibit))
-#define PK_INHIBIT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), PK_TYPE_INHIBIT, PkInhibitClass))
-#define PK_IS_INHIBIT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PK_TYPE_INHIBIT))
-#define PK_IS_INHIBIT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), PK_TYPE_INHIBIT))
-#define PK_INHIBIT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PK_TYPE_INHIBIT, PkInhibitClass))
-#define PK_INHIBIT_ERROR (pk_inhibit_error_quark ())
-#define PK_INHIBIT_TYPE_ERROR (pk_inhibit_error_get_type ())
+#define GPK_TYPE_INHIBIT (gpk_inhibit_get_type ())
+#define GPK_INHIBIT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GPK_TYPE_INHIBIT, GpkInhibit))
+#define GPK_INHIBIT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GPK_TYPE_INHIBIT, GpkInhibitClass))
+#define PK_IS_INHIBIT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GPK_TYPE_INHIBIT))
+#define PK_IS_INHIBIT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GPK_TYPE_INHIBIT))
+#define GPK_INHIBIT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GPK_TYPE_INHIBIT, GpkInhibitClass))
+#define GPK_INHIBIT_ERROR (gpk_inhibit_error_quark ())
+#define GPK_INHIBIT_TYPE_ERROR (gpk_inhibit_error_get_type ())
-typedef struct PkInhibitPrivate PkInhibitPrivate;
+typedef struct GpkInhibitPrivate GpkInhibitPrivate;
typedef struct
{
GObject parent;
- PkInhibitPrivate *priv;
-} PkInhibit;
+ GpkInhibitPrivate *priv;
+} GpkInhibit;
typedef struct
{
GObjectClass parent_class;
-} PkInhibitClass;
+} GpkInhibitClass;
-GType pk_inhibit_get_type (void);
-PkInhibit *pk_inhibit_new (void);
-gboolean pk_inhibit_create (PkInhibit *inhibit);
-gboolean pk_inhibit_remove (PkInhibit *inhibit);
+GType gpk_inhibit_get_type (void);
+GpkInhibit *gpk_inhibit_new (void);
+gboolean gpk_inhibit_create (GpkInhibit *inhibit);
+gboolean gpk_inhibit_remove (GpkInhibit *inhibit);
G_END_DECLS
-#endif /* __PK_INHIBIT_H */
+#endif /* __GPK_INHIBIT_H */
Modified: trunk/src/gpk-install-file.c
==============================================================================
--- trunk/src/gpk-install-file.c (original)
+++ trunk/src/gpk-install-file.c Tue Apr 1 23:21:47 2008
@@ -49,7 +49,7 @@
} PkPageEnum;
static void
-pk_updates_set_page (PkPageEnum page)
+gpk_install_file_set_page (PkPageEnum page)
{
GList *list, *l;
GtkWidget *widget;
@@ -67,7 +67,7 @@
}
static gboolean
-finished_timeout (gpointer data)
+gpk_install_finished_timeout (gpointer data)
{
gtk_main_quit ();
@@ -75,15 +75,15 @@
}
static void
-pk_install_file_finished_cb (PkClient *client,
+gpk_install_file_finished_cb (PkClient *client,
PkExitEnum exit,
guint runtime,
gpointer data)
{
if (exit == PK_EXIT_ENUM_SUCCESS) {
- pk_updates_set_page (PAGE_CONFIRM);
+ gpk_install_file_set_page (PAGE_CONFIRM);
- g_timeout_add_seconds (30, finished_timeout, NULL);
+ g_timeout_add_seconds (30, gpk_install_finished_timeout, NULL);
}
}
@@ -91,7 +91,7 @@
static gint pulse_timeout = 0;
static void
-pk_install_file_progress_changed_cb (PkClient *client,
+gpk_install_file_progress_changed_cb (PkClient *client,
guint percentage,
guint subpercentage,
guint elapsed,
@@ -125,15 +125,15 @@
}
static void
-pk_install_file_status_changed_cb (PkClient *client,
- PkStatusEnum status,
- gpointer data)
+gpk_install_file_status_changed_cb (PkClient *client,
+ PkStatusEnum status,
+ gpointer data)
{
GtkWidget *widget;
gchar *text;
widget = glade_xml_get_widget (glade_xml, "progress_part_label");
- text = g_strdup_printf ("<b>%s</b>", pk_status_enum_to_localised_text (status));
+ text = g_strdup_printf ("<b>%s</b>", gpk_status_enum_to_localised_text (status));
gtk_label_set_markup (GTK_LABEL (widget), text);
g_free (text);
@@ -148,27 +148,27 @@
}
static void
-pk_install_file_error_code_cb (PkClient *client,
- PkErrorCodeEnum code,
- const gchar *details,
- gpointer data)
+gpk_install_file_error_code_cb (PkClient *client,
+ PkErrorCodeEnum code,
+ const gchar *details,
+ gpointer data)
{
GtkWidget *widget;
const gchar *title;
gchar *title_bold;
gchar *details_safe;
- pk_updates_set_page (PAGE_ERROR);
+ gpk_install_file_set_page (PAGE_ERROR);
/* set bold title */
widget = glade_xml_get_widget (glade_xml, "label_error_title");
- title = pk_error_enum_to_localised_text (code);
+ title = gpk_error_enum_to_localised_text (code);
title_bold = g_strdup_printf ("<b>%s</b>", title);
gtk_label_set_label (GTK_LABEL (widget), title_bold);
g_free (title_bold);
widget = glade_xml_get_widget (glade_xml, "label_error_message");
- gtk_label_set_label (GTK_LABEL (widget), pk_error_enum_to_localised_message (code));
+ gtk_label_set_label (GTK_LABEL (widget), gpk_error_enum_to_localised_message (code));
widget = glade_xml_get_widget (glade_xml, "label_error_details");
details_safe = g_markup_escape_text (details, -1);
@@ -177,8 +177,8 @@
static gboolean
pk_window_delete_event_cb (GtkWidget *widget,
- GdkEvent *event,
- gpointer data)
+ GdkEvent *event,
+ gpointer data)
{
gtk_main_quit ();
@@ -226,7 +226,7 @@
g_type_init ();
g_set_application_name (_("PackageKit File Installer"));
- context = g_option_context_new (_("FILE"));
+ context = g_option_context_new (NULL);
g_option_context_set_summary (context, _("PackageKit File Installer"));
g_option_context_add_main_entries (context, options, NULL);
g_option_context_parse (context, &argc, &argv, NULL);
@@ -245,20 +245,20 @@
PK_DATA G_DIR_SEPARATOR_S "icons");
if (argc < 2) {
- g_print (_("You need to specify a file to install\n"));
+ g_print ("%s\n", _("You need to specify a file to install"));
return 1;
}
client = pk_client_new ();
g_signal_connect (client, "finished",
- G_CALLBACK (pk_install_file_finished_cb), NULL);
+ G_CALLBACK (gpk_install_file_finished_cb), NULL);
g_signal_connect (client, "progress-changed",
- G_CALLBACK (pk_install_file_progress_changed_cb), NULL);
+ G_CALLBACK (gpk_install_file_progress_changed_cb), NULL);
g_signal_connect (client, "status-changed",
- G_CALLBACK (pk_install_file_status_changed_cb), NULL);
+ G_CALLBACK (gpk_install_file_status_changed_cb), NULL);
g_signal_connect (client, "error-code",
- G_CALLBACK (pk_install_file_error_code_cb), NULL);
+ G_CALLBACK (gpk_install_file_error_code_cb), NULL);
glade_xml = glade_xml_new (PK_DATA "/gpk-install-file.glade", NULL, NULL);
main_window = glade_xml_get_widget (glade_xml, "window_updates");
@@ -283,7 +283,7 @@
widget = glade_xml_get_widget (glade_xml, "progress_part_label");
gtk_label_set_label (GTK_LABEL (widget), "");
- pk_updates_set_page (PAGE_PROGRESS);
+ gpk_install_file_set_page (PAGE_PROGRESS);
error = NULL;
ret = pk_client_install_file (client, argv[1], &error);
@@ -292,11 +292,11 @@
/* check if we got a permission denied */
if (g_str_has_prefix (error->message, "org.freedesktop.packagekit.localinstall")) {
- pk_error_modal_dialog (_("Failed to install"),
+ gpk_error_modal_dialog (_("Failed to install"),
_("You don't have the necessary privileges to install local packages"));
}
else {
- pk_error_modal_dialog (_("Failed to install"),
+ gpk_error_modal_dialog (_("Failed to install"),
error->message);
}
} else {
Modified: trunk/src/gpk-install-package.c
==============================================================================
--- trunk/src/gpk-install-package.c (original)
+++ trunk/src/gpk-install-package.c Tue Apr 1 23:21:47 2008
@@ -38,15 +38,15 @@
#include "gpk-progress.h"
#include "gpk-common.h"
-static PkProgress *progress = NULL;
+static GpkProgress *progress = NULL;
static gchar *package = NULL;
static GMainLoop *loop = NULL;
/**
- * pk_monitor_action_unref_cb:
+ * gpk_install_package_action_unref_cb:
**/
static void
-pk_monitor_action_unref_cb (PkProgress *progress, gpointer data)
+gpk_install_package_action_unref_cb (GpkProgress *progress, gpointer data)
{
GMainLoop *loop = (GMainLoop *) data;
g_object_unref (progress);
@@ -54,19 +54,19 @@
}
/**
- * pk_monitor_install_finished_cb:
+ * gpk_install_package_install_finished_cb:
**/
static void
-pk_monitor_install_finished_cb (PkClient *client, PkExitEnum exit_code, guint runtime, gpointer data)
+gpk_install_package_install_finished_cb (PkClient *client, PkExitEnum exit_code, guint runtime, gpointer data)
{
g_object_unref (client);
}
/**
- * pk_monitor_resolve_finished_cb:
+ * gpk_install_package_resolve_finished_cb:
**/
static void
-pk_monitor_resolve_finished_cb (PkClient *client, PkExitEnum exit_code, guint runtime, gpointer data)
+gpk_install_package_resolve_finished_cb (PkClient *client, PkExitEnum exit_code, guint runtime, gpointer data)
{
gchar *tid;
gboolean ret;
@@ -76,7 +76,7 @@
/* did we resolve? */
if (pk_strzero (package)) {
- pk_error_modal_dialog (_("Failed to resolve"),
+ gpk_error_modal_dialog (_("Failed to resolve"),
_("The package could not be found on the system"));
g_main_loop_quit (loop);
return;
@@ -85,12 +85,12 @@
/* create a new instance */
client = pk_client_new ();
g_signal_connect (client, "finished",
- G_CALLBACK (pk_monitor_install_finished_cb), NULL);
+ G_CALLBACK (gpk_install_package_install_finished_cb), NULL);
pk_warning ("Installing '%s'", package);
ret = pk_client_install_package (client, package, NULL);
if (ret == FALSE) {
- pk_error_modal_dialog (_("Method not supported"),
+ gpk_error_modal_dialog (_("Method not supported"),
_("Installing packages is not supported"));
g_object_unref (client);
g_main_loop_quit (loop);
@@ -99,19 +99,19 @@
tid = pk_client_get_tid (client);
/* create a new progress object */
- progress = pk_progress_new ();
+ progress = gpk_progress_new ();
g_signal_connect (progress, "action-unref",
- G_CALLBACK (pk_monitor_action_unref_cb), loop);
- pk_progress_monitor_tid (progress, tid);
+ G_CALLBACK (gpk_install_package_action_unref_cb), loop);
+ gpk_progress_monitor_tid (progress, tid);
g_free (tid);
}
/**
- * pk_monitor_resolve_package_cb:
+ * gpk_install_package_resolve_package_cb:
**/
static void
-pk_monitor_resolve_package_cb (PkClient *client, PkInfoEnum info, const gchar *package_id,
- const gchar *summary, gboolean data)
+gpk_install_package_resolve_package_cb (PkClient *client, PkInfoEnum info, const gchar *package_id,
+ const gchar *summary, gboolean data)
{
/* save */
pk_debug ("package '%s' resolved!", package_id);
@@ -171,20 +171,20 @@
PK_DATA G_DIR_SEPARATOR_S "icons");
if (argc < 2) {
- g_print (_("You need to specify a package to install\n"));
+ g_print ("%s\n", _("You need to specify a package to install"));
return 1;
}
loop = g_main_loop_new (NULL, FALSE);
client = pk_client_new ();
g_signal_connect (client, "finished",
- G_CALLBACK (pk_monitor_resolve_finished_cb), NULL);
+ G_CALLBACK (gpk_install_package_resolve_finished_cb), NULL);
g_signal_connect (client, "package",
- G_CALLBACK (pk_monitor_resolve_package_cb), NULL);
+ G_CALLBACK (gpk_install_package_resolve_package_cb), NULL);
filter = pk_filter_enum_to_text (PK_FILTER_ENUM_NOT_INSTALLED);
ret = pk_client_resolve (client, filter, argv[1], NULL);
if (ret == FALSE) {
- pk_error_modal_dialog (_("Method not supported"),
+ gpk_error_modal_dialog (_("Method not supported"),
_("Resolving names to packages is not supported"));
} else {
g_main_loop_run (loop);
Modified: trunk/src/gpk-log.c
==============================================================================
--- trunk/src/gpk-log.c (original)
+++ trunk/src/gpk-log.c Tue Apr 1 23:21:47 2008
@@ -73,7 +73,7 @@
pk_button_help_cb (GtkWidget *widget,
gboolean data)
{
- pk_show_help ("software-sources");
+ gpk_show_help ("software-sources");
}
/**
@@ -163,7 +163,7 @@
pretty = pk_transaction_db_get_pretty_date (timespec);
pk_debug ("pretty=%s", pretty);
- role_text = pk_role_enum_to_localised_past (role);
+ role_text = gpk_role_enum_to_localised_past (role);
text = g_markup_printf_escaped ("<b>%s</b>\n%s", role_text, pretty);
g_free (pretty);
@@ -173,7 +173,7 @@
PACKAGES_COLUMN_GENERAL_ID, tid,
-1);
- icon_name = pk_role_enum_to_icon_name (role);
+ icon_name = gpk_role_enum_to_icon_name (role);
gtk_list_store_set (list_store_general, &iter, PACKAGES_COLUMN_GENERAL_ICON, icon_name, -1);
if (succeeded) {
@@ -267,9 +267,9 @@
const gchar *icon_name;
const gchar *info_text;
- info_text = pk_info_enum_to_localised_text (info);
- text = pk_package_id_pretty (package_id, summary);
- icon_name = pk_info_enum_to_icon_name (info);
+ info_text = gpk_info_enum_to_localised_text (info);
+ text = gpk_package_id_pretty (package_id, summary);
+ icon_name = gpk_info_enum_to_icon_name (info);
gtk_list_store_append (list_store_details, &iter);
gtk_list_store_set (list_store_details, &iter,
@@ -395,7 +395,7 @@
g_type_init ();
context = g_option_context_new (NULL);
- g_option_context_set_summary (context, _("Transaction Viewer"));
+ g_option_context_set_summary (context, _("Software Log Viewer"));
g_option_context_add_main_entries (context, options, NULL);
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
Modified: trunk/src/gpk-notify.c
==============================================================================
--- trunk/src/gpk-notify.c (original)
+++ trunk/src/gpk-notify.c Tue Apr 1 23:21:47 2008
@@ -65,7 +65,7 @@
PkConnection *pconnection;
PkClient *client_update_system;
PkTaskList *tlist;
- PkAutoRefresh *arefresh;
+ GpkAutoRefresh *arefresh;
PkNotify *notify;
GConfClient *gconf_client;
gboolean cache_okay;
@@ -96,7 +96,7 @@
{
g_return_if_fail (notify != NULL);
g_return_if_fail (GPK_IS_NOTIFY (notify));
- pk_show_help (NULL);
+ gpk_show_help ("update-icon");
}
/**
@@ -319,7 +319,7 @@
}
/* are we accepting notifications */
- value = gconf_client_get_bool (notify->priv->gconf_client, PK_CONF_NOTIFY_MESSAGE, NULL);
+ value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_MESSAGE, NULL);
if (value == FALSE) {
pk_debug ("not showing notification as prevented in gconf");
return;
@@ -343,15 +343,16 @@
/* notify the user if there were skipped entries */
if (skipped_number > 0) {
- message = ngettext (_("One package was skipped:\n"),
- _("Some packages were skipped:\n"), skipped_number);
+ message = ngettext (_("One package was skipped:"),
+ _("Some packages were skipped:"), skipped_number);
g_string_prepend (message_text, message);
+ g_string_append_c (message_text, '\n');
}
/* add a message that we need to restart */
restart = pk_client_get_require_restart (client);
if (restart != PK_RESTART_ENUM_NONE) {
- message = pk_restart_enum_to_localised_text (restart);
+ message = gpk_restart_enum_to_localised_text (restart);
/* add a gap if we are putting both */
if (skipped_number > 0) {
@@ -359,7 +360,7 @@
}
g_string_append (message_text, message);
- g_string_append (message_text, "\n");
+ g_string_append_c (message_text, '\n');
}
/* trim off extra newlines */
@@ -376,7 +377,7 @@
if (restart == PK_RESTART_ENUM_SYSTEM) {
gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_RESTART_COMPUTER, NULL);
}
- gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, PK_CONF_NOTIFY_RESTART);
+ gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_RESTART);
gpk_smart_icon_notify_show (notify->priv->sicon);
g_string_free (message_text, TRUE);
}
@@ -395,6 +396,12 @@
g_return_val_if_fail (GPK_IS_NOTIFY (notify), FALSE);
pk_debug ("install updates");
+ ret = pk_client_reset (notify->priv->client_update_system, &error);
+ if (!ret) {
+ pk_warning ("failed to reset client: %s", error->message);
+ g_error_free (error);
+ return FALSE;
+ }
ret = pk_client_update_system (notify->priv->client_update_system, &error);
if (ret) {
gpk_smart_icon_set_icon_name (notify->priv->sicon, NULL);
@@ -405,7 +412,7 @@
gpk_smart_icon_notify_new (notify->priv->sicon, _("Failed to update system"), message,
"process-stop", GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_SHORT);
g_free (message);
- gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, PK_CONF_NOTIFY_ERROR);
+ gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_ERROR);
gpk_smart_icon_notify_show (notify->priv->sicon);
}
return ret;
@@ -494,26 +501,34 @@
const gchar *title;
gchar *message;
gboolean value;
+ GString *string;
g_return_if_fail (notify != NULL);
g_return_if_fail (GPK_IS_NOTIFY (notify));
/* are we accepting notifications */
- value = gconf_client_get_bool (notify->priv->gconf_client, PK_CONF_NOTIFY_CRITICAL, NULL);
+ value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_CRITICAL, NULL);
if (value == FALSE) {
pk_debug ("not showing notification as prevented in gconf");
return;
}
+ /* format title */
title = ngettext ("Security update available", "Security updates available", number);
- message = g_strdup_printf (ngettext ("The following important update is available for your computer:\n\n%s",
- "The following important updates are available for your computer:\n\n%s", number), details);
+
+ /* format message text */
+ string = g_string_new ("");
+ g_string_append (string, ngettext ("The following important update is available for your computer:",
+ "The following important updates are available for your computer:", number));
+ g_string_append (string, "\n\n");
+ g_string_append (string, details);
+ message = g_string_free (string, FALSE);
pk_debug ("Doing critical updates warning: %s", message);
gpk_smart_icon_notify_new (notify->priv->sicon, title, message, "software-update-urgent",
- GPK_NOTIFY_URGENCY_CRITICAL, GPK_NOTIFY_TIMEOUT_NEVER);
+ GPK_NOTIFY_URGENCY_CRITICAL, GPK_NOTIFY_TIMEOUT_NEVER);
gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_UPDATE_COMPUTER, NULL);
- gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_WARN_AGAIN, PK_CONF_NOTIFY_CRITICAL);
+ gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_WARN_AGAIN, GPK_CONF_NOTIFY_CRITICAL);
gpk_smart_icon_notify_show (notify->priv->sicon);
g_free (message);
@@ -531,7 +546,7 @@
g_return_if_fail (GPK_IS_NOTIFY (notify));
/* are we accepting notifications */
- value = gconf_client_get_bool (notify->priv->gconf_client, PK_CONF_NOTIFY_MESSAGE, NULL);
+ value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_MESSAGE, NULL);
if (value == FALSE) {
pk_debug ("not showing notification as prevented in gconf");
return;
@@ -542,7 +557,7 @@
_("Updates are being automatically installed on your computer"), "software-update-urgent",
GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_LONG);
gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_CANCEL_UPDATE, NULL);
- gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, PK_CONF_NOTIFY_STARTED);
+ gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_STARTED);
gpk_smart_icon_notify_show (notify->priv->sicon);
}
@@ -612,7 +627,7 @@
}
/* get the icon */
- icon = pk_info_enum_to_icon_name (value);
+ icon = gpk_info_enum_to_icon_name (value);
g_object_unref (elist);
return icon;
@@ -631,11 +646,11 @@
g_return_val_if_fail (notify != NULL, FALSE);
g_return_val_if_fail (GPK_IS_NOTIFY (notify), FALSE);
- on_battery = pk_auto_refresh_get_on_battery (notify->priv->arefresh);
- conf_update_battery = gconf_client_get_bool (notify->priv->gconf_client, PK_CONF_UPDATE_BATTERY, NULL);
+ on_battery = gpk_auto_refresh_get_on_battery (notify->priv->arefresh);
+ conf_update_battery = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_UPDATE_BATTERY, NULL);
if (!conf_update_battery && on_battery) {
/* are we accepting notifications */
- value = gconf_client_get_bool (notify->priv->gconf_client, PK_CONF_NOTIFY_BATTERY_UPDATE, NULL);
+ value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_BATTERY_UPDATE, NULL);
if (value) {
gpk_smart_icon_notify_new (notify->priv->sicon,
_("Will not install updates"),
@@ -643,7 +658,7 @@
"dialog-information", GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_LONG);
gpk_smart_icon_notify_button (notify->priv->sicon,
GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN,
- PK_CONF_NOTIFY_BATTERY_UPDATE);
+ GPK_CONF_NOTIFY_BATTERY_UPDATE);
gpk_smart_icon_notify_show (notify->priv->sicon);
}
return FALSE;
@@ -663,9 +678,9 @@
g_return_val_if_fail (notify != NULL, FALSE);
g_return_val_if_fail (GPK_IS_NOTIFY (notify), FALSE);
- updates = gconf_client_get_string (notify->priv->gconf_client, PK_CONF_AUTO_UPDATE, NULL);
+ updates = gconf_client_get_string (notify->priv->gconf_client, GPK_CONF_AUTO_UPDATE, NULL);
if (updates == NULL) {
- pk_warning ("'%s' gconf key is null!", PK_CONF_AUTO_UPDATE);
+ pk_warning ("'%s' gconf key is null!", GPK_CONF_AUTO_UPDATE);
return PK_UPDATE_ENUM_UNKNOWN;
}
update = pk_update_enum_from_text (updates);
@@ -778,6 +793,14 @@
}
pk_debug ("just process security updates");
+ ret = pk_client_reset (notify->priv->client_update_system, &error);
+ if (!ret) {
+ pk_warning ("failed to reset client: %s", error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ /* convert */
package_ids = pk_package_ids_from_array (security_array);
ret = pk_client_update_packages_strv (notify->priv->client_update_system, package_ids, &error);
if (!ret) {
@@ -822,7 +845,7 @@
g_return_if_fail (notify != NULL);
g_return_if_fail (GPK_IS_NOTIFY (notify));
- title = pk_error_enum_to_localised_text (error_code);
+ title = gpk_error_enum_to_localised_text (error_code);
/* ignore some errors */
if (error_code == PK_ERROR_ENUM_PROCESS_KILL ||
@@ -832,7 +855,7 @@
}
/* are we accepting notifications */
- value = gconf_client_get_bool (notify->priv->gconf_client, PK_CONF_NOTIFY_ERROR, NULL);
+ value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_ERROR, NULL);
if (value == FALSE) {
pk_debug ("not showing notification as prevented in gconf");
return;
@@ -840,7 +863,7 @@
gpk_smart_icon_notify_new (notify->priv->sicon, title, details, "help-browser",
GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_LONG);
- gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, PK_CONF_NOTIFY_ERROR);
+ gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_ERROR);
gpk_smart_icon_notify_show (notify->priv->sicon);
}
@@ -999,7 +1022,7 @@
* gpk_notify_auto_refresh_cache_cb:
**/
static void
-gpk_notify_auto_refresh_cache_cb (PkAutoRefresh *arefresh, GpkNotify *notify)
+gpk_notify_auto_refresh_cache_cb (GpkAutoRefresh *arefresh, GpkNotify *notify)
{
g_return_if_fail (notify != NULL);
g_return_if_fail (GPK_IS_NOTIFY (notify));
@@ -1012,7 +1035,7 @@
* gpk_notify_auto_get_updates_cb:
**/
static void
-gpk_notify_auto_get_updates_cb (PkAutoRefresh *arefresh, GpkNotify *notify)
+gpk_notify_auto_get_updates_cb (GpkAutoRefresh *arefresh, GpkNotify *notify)
{
g_return_if_fail (notify != NULL);
g_return_if_fail (GPK_IS_NOTIFY (notify));
@@ -1060,7 +1083,7 @@
gpk_notify_update_system (notify);
} else if (button == GPK_NOTIFY_BUTTON_RESTART_COMPUTER) {
/* restart using gnome-power-manager */
- ret = pk_restart_system ();
+ ret = gpk_restart_system ();
if (!ret) {
pk_warning ("failed to reboot");
}
@@ -1082,7 +1105,7 @@
G_CALLBACK (gpk_notify_smart_icon_notify_button), notify);
notify->priv->gconf_client = gconf_client_get_default ();
- notify->priv->arefresh = pk_auto_refresh_new ();
+ notify->priv->arefresh = gpk_auto_refresh_new ();
g_signal_connect (notify->priv->arefresh, "refresh-cache",
G_CALLBACK (gpk_notify_auto_refresh_cache_cb), notify);
g_signal_connect (notify->priv->arefresh, "get-updates",
Modified: trunk/src/gpk-prefs.c
==============================================================================
--- trunk/src/gpk-prefs.c (original)
+++ trunk/src/gpk-prefs.c Tue Apr 1 23:21:47 2008
@@ -54,7 +54,7 @@
static void
pk_button_help_cb (GtkWidget *widget, gboolean data)
{
- pk_show_help ("prefs");
+ gpk_show_help ("prefs");
}
/**
@@ -128,8 +128,8 @@
}
action = pk_freq_enum_to_text (freq);
- pk_debug ("Changing %s to %s", PK_CONF_FREQUENCY_GET_UPDATES, action);
- gconf_client_set_string (client, PK_CONF_FREQUENCY_GET_UPDATES, action, NULL);
+ pk_debug ("Changing %s to %s", GPK_CONF_FREQUENCY_GET_UPDATES, action);
+ gconf_client_set_string (client, GPK_CONF_FREQUENCY_GET_UPDATES, action, NULL);
g_free (value);
g_object_unref (client);
}
@@ -172,8 +172,8 @@
}
action = pk_update_enum_to_text (update);
- pk_debug ("Changing %s to %s", PK_CONF_AUTO_UPDATE, action);
- gconf_client_set_string (client, PK_CONF_AUTO_UPDATE, action, NULL);
+ pk_debug ("Changing %s to %s", GPK_CONF_AUTO_UPDATE, action);
+ gconf_client_set_string (client, GPK_CONF_AUTO_UPDATE, action, NULL);
g_free (value);
g_object_unref (client);
}
@@ -192,8 +192,8 @@
client = gconf_client_get_default ();
widget = glade_xml_get_widget (glade_xml, "combobox_check");
- is_writable = gconf_client_key_is_writable (client, PK_CONF_FREQUENCY_GET_UPDATES, NULL);
- value = gconf_client_get_string (client, PK_CONF_FREQUENCY_GET_UPDATES, NULL);
+ is_writable = gconf_client_key_is_writable (client, GPK_CONF_FREQUENCY_GET_UPDATES, NULL);
+ value = gconf_client_get_string (client, GPK_CONF_FREQUENCY_GET_UPDATES, NULL);
if (value == NULL) {
pk_warning ("invalid schema, please re-install");
return;
@@ -232,8 +232,8 @@
client = gconf_client_get_default ();
widget = glade_xml_get_widget (glade_xml, "combobox_install");
- is_writable = gconf_client_key_is_writable (client, PK_CONF_AUTO_UPDATE, NULL);
- value = gconf_client_get_string (client, PK_CONF_AUTO_UPDATE, NULL);
+ is_writable = gconf_client_key_is_writable (client, GPK_CONF_AUTO_UPDATE, NULL);
+ value = gconf_client_get_string (client, GPK_CONF_AUTO_UPDATE, NULL);
if (value == NULL) {
pk_warning ("invalid schema, please re-install");
return;
@@ -344,13 +344,13 @@
G_CALLBACK (pk_window_delete_event_cb), loop);
widget = glade_xml_get_widget (glade_xml, "checkbutton_notify_updates");
- pk_prefs_notify_checkbutton_setup (widget, PK_CONF_NOTIFY_AVAILABLE);
+ pk_prefs_notify_checkbutton_setup (widget, GPK_CONF_NOTIFY_AVAILABLE);
widget = glade_xml_get_widget (glade_xml, "checkbutton_notify_completed");
- pk_prefs_notify_checkbutton_setup (widget, PK_CONF_NOTIFY_COMPLETED);
+ pk_prefs_notify_checkbutton_setup (widget, GPK_CONF_NOTIFY_COMPLETED);
widget = glade_xml_get_widget (glade_xml, "checkbutton_update_battery");
- pk_prefs_notify_checkbutton_setup (widget, PK_CONF_UPDATE_BATTERY);
+ pk_prefs_notify_checkbutton_setup (widget, GPK_CONF_UPDATE_BATTERY);
widget = glade_xml_get_widget (glade_xml, "button_close");
g_signal_connect (widget, "clicked",
Modified: trunk/src/gpk-progress.c
==============================================================================
--- trunk/src/gpk-progress.c (original)
+++ trunk/src/gpk-progress.c Tue Apr 1 23:21:47 2008
@@ -38,13 +38,13 @@
#include "gpk-common.h"
#include "gpk-progress.h"
-static void pk_progress_class_init (PkProgressClass *klass);
-static void pk_progress_init (PkProgress *progress);
-static void pk_progress_finalize (GObject *object);
+static void gpk_progress_class_init (GpkProgressClass *klass);
+static void gpk_progress_init (GpkProgress *progress);
+static void gpk_progress_finalize (GObject *object);
-#define PK_PROGRESS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PK_TYPE_PROGRESS, PkProgressPrivate))
+#define GPK_PROGRESS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPK_TYPE_PROGRESS, GpkProgressPrivate))
-struct PkProgressPrivate
+struct GpkProgressPrivate
{
GladeXML *glade_xml;
PkClient *client;
@@ -61,18 +61,18 @@
static guint signals [LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (PkProgress, pk_progress, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GpkProgress, gpk_progress, G_TYPE_OBJECT)
/**
- * pk_progress_class_init:
+ * gpk_progress_class_init:
* @klass: This graph class instance
**/
static void
-pk_progress_class_init (PkProgressClass *klass)
+gpk_progress_class_init (GpkProgressClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = pk_progress_finalize;
- g_type_class_add_private (klass, sizeof (PkProgressPrivate));
+ object_class->finalize = gpk_progress_finalize;
+ g_type_class_add_private (klass, sizeof (GpkProgressPrivate));
signals [ACTION_UNREF] =
g_signal_new ("action-unref",
@@ -84,10 +84,10 @@
}
/**
- * pk_progress_error_code_cb:
+ * gpk_progress_error_code_cb:
**/
static void
-pk_progress_error_message (PkProgress *progress, const gchar *title, const gchar *details)
+gpk_progress_error_message (GpkProgress *progress, const gchar *title, const gchar *details)
{
GtkWidget *main_window;
GtkWidget *dialog;
@@ -97,7 +97,7 @@
main_window = glade_xml_get_widget (progress->priv->glade_xml, "window_progress");
dialog = gtk_message_dialog_new (GTK_WINDOW (main_window), GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, title);
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", title);
if (details != NULL) {
escaped_details = g_markup_escape_text (details, -1);
@@ -110,10 +110,10 @@
}
/**
- * pk_progress_clean_exit:
+ * gpk_progress_clean_exit:
**/
static void
-pk_progress_clean_exit (PkProgress *progress)
+gpk_progress_clean_exit (GpkProgress *progress)
{
/* remove the back and forth progress bar update */
if (progress->priv->no_percentage_evt != 0) {
@@ -128,22 +128,22 @@
}
/**
- * pk_progress_help_cb:
+ * gpk_progress_help_cb:
**/
static void
-pk_progress_help_cb (GtkWidget *widget,
- PkProgress *progress)
+gpk_progress_help_cb (GtkWidget *widget,
+ GpkProgress *progress)
{
pk_debug ("emitting help");
- pk_progress_clean_exit (progress);
+ gpk_progress_clean_exit (progress);
}
/**
- * pk_progress_cancel_cb:
+ * gpk_progress_cancel_cb:
**/
static void
-pk_progress_cancel_cb (GtkWidget *widget,
- PkProgress *progress)
+gpk_progress_cancel_cb (GtkWidget *widget,
+ GpkProgress *progress)
{
gboolean ret;
GError *error = NULL;
@@ -157,21 +157,21 @@
}
/**
- * pk_progress_hide_cb:
+ * gpk_progress_hide_cb:
**/
static void
-pk_progress_hide_cb (GtkWidget *widget,
- PkProgress *progress)
+gpk_progress_hide_cb (GtkWidget *widget,
+ GpkProgress *progress)
{
pk_debug ("hide");
- pk_progress_clean_exit (progress);
+ gpk_progress_clean_exit (progress);
}
/**
- * pk_progress_error_code_cb:
+ * gpk_progress_error_code_cb:
**/
static void
-pk_progress_error_code_cb (PkClient *client, PkErrorCodeEnum code, const gchar *details, PkProgress *progress)
+gpk_progress_error_code_cb (PkClient *client, PkErrorCodeEnum code, const gchar *details, GpkProgress *progress)
{
/* ignore some errors */
if (code == PK_ERROR_ENUM_TRANSACTION_CANCELLED ||
@@ -179,26 +179,26 @@
pk_debug ("ignoring cancel error");
return;
}
- pk_progress_error_message (progress, pk_error_enum_to_localised_text (code), details);
+ gpk_progress_error_message (progress, gpk_error_enum_to_localised_text (code), details);
}
/**
- * pk_progress_finished_timeout:
+ * gpk_progress_finished_timeout:
**/
static gboolean
-pk_progress_finished_timeout (gpointer data)
+gpk_progress_finished_timeout (gpointer data)
{
- PkProgress *progress = PK_PROGRESS (data);
+ GpkProgress *progress = GPK_PROGRESS (data);
pk_debug ("emit unref");
- pk_progress_clean_exit (progress);
+ gpk_progress_clean_exit (progress);
return FALSE;
}
/**
- * pk_progress_finished_cb:
+ * gpk_progress_finished_cb:
**/
static void
-pk_progress_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, PkProgress *progress)
+gpk_progress_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, GpkProgress *progress)
{
GtkWidget *widget;
pk_debug ("finished");
@@ -223,15 +223,15 @@
progress->priv->task_ended = TRUE;
/* wait 5 seconds */
- progress->priv->no_percentage_evt = g_timeout_add_seconds (30, pk_progress_finished_timeout, progress);
+ progress->priv->no_percentage_evt = g_timeout_add_seconds (30, gpk_progress_finished_timeout, progress);
}
/**
- * pk_progress_package_cb:
+ * gpk_progress_package_cb:
*/
static void
-pk_progress_package_cb (PkClient *client, PkInfoEnum info, const gchar *package_id,
- const gchar *summary, PkProgress *progress)
+gpk_progress_package_cb (PkClient *client, PkInfoEnum info, const gchar *package_id,
+ const gchar *summary, GpkProgress *progress)
{
GtkWidget *widget;
PkPackageId *ident;
@@ -248,13 +248,13 @@
}
/**
- * pk_progress_spin_timeout_percentage:
+ * gpk_progress_spin_timeout_percentage:
**/
static gboolean
-pk_progress_spin_timeout_percentage (gpointer data)
+gpk_progress_spin_timeout_percentage (gpointer data)
{
GtkWidget *widget;
- PkProgress *progress = PK_PROGRESS (data);
+ GpkProgress *progress = GPK_PROGRESS (data);
widget = glade_xml_get_widget (progress->priv->glade_xml, "progressbar_percentage");
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (widget));
@@ -273,13 +273,13 @@
}
/**
- * pk_progress_spin_timeout_subpercentage:
+ * gpk_progress_spin_timeout_subpercentage:
**/
static gboolean
-pk_progress_spin_timeout_subpercentage (gpointer data)
+gpk_progress_spin_timeout_subpercentage (gpointer data)
{
GtkWidget *widget;
- PkProgress *progress = PK_PROGRESS (data);
+ GpkProgress *progress = GPK_PROGRESS (data);
widget = glade_xml_get_widget (progress->priv->glade_xml, "progressbar_subpercentage");
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (widget));
@@ -298,10 +298,10 @@
}
/**
- * pk_progress_action_percentage:
+ * gpk_progress_action_percentage:
**/
static void
-pk_progress_action_percentage (PkProgress *progress, guint percentage)
+gpk_progress_action_percentage (GpkProgress *progress, guint percentage)
{
GtkWidget *widget_hbox;
GtkWidget *widget_percentage;
@@ -326,8 +326,8 @@
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (widget_percentage), NULL);
/* don't queue duplicate events */
if (progress->priv->no_percentage_evt == 0) {
- progress->priv->no_percentage_evt = g_timeout_add (PK_PROGRESS_BAR_PULSE_DELAY,
- pk_progress_spin_timeout_percentage, progress);
+ progress->priv->no_percentage_evt = g_timeout_add (GPK_PROGRESS_BAR_PULSE_DELAY,
+ gpk_progress_spin_timeout_percentage, progress);
}
return;
}
@@ -346,10 +346,10 @@
}
/**
- * pk_progress_action_subpercentage:
+ * gpk_progress_action_subpercentage:
**/
static void
-pk_progress_action_subpercentage (PkProgress *progress, guint percentage)
+gpk_progress_action_subpercentage (GpkProgress *progress, guint percentage)
{
GtkWidget *widget_hbox;
GtkWidget *widget_percentage;
@@ -376,8 +376,8 @@
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (widget_percentage), NULL);
/* don't queue duplicate events */
if (progress->priv->no_subpercentage_evt == 0) {
- progress->priv->no_subpercentage_evt = g_timeout_add (PK_PROGRESS_BAR_PULSE_DELAY,
- pk_progress_spin_timeout_subpercentage, progress);
+ progress->priv->no_subpercentage_evt = g_timeout_add (GPK_PROGRESS_BAR_PULSE_DELAY,
+ gpk_progress_spin_timeout_subpercentage, progress);
}
return;
}
@@ -393,34 +393,34 @@
}
/**
- * pk_progress_progress_changed_cb:
+ * gpk_progress_progress_changed_cb:
**/
static void
-pk_progress_progress_changed_cb (PkClient *client, guint percentage, guint subpercentage,
- guint elapsed, guint remaining, PkProgress *progress)
+gpk_progress_progress_changed_cb (PkClient *client, guint percentage, guint subpercentage,
+ guint elapsed, guint remaining, GpkProgress *progress)
{
GtkWidget *widget;
gchar *time;
- pk_progress_action_percentage (progress, percentage);
- pk_progress_action_subpercentage (progress, subpercentage);
+ gpk_progress_action_percentage (progress, percentage);
+ gpk_progress_action_subpercentage (progress, subpercentage);
/* set some localised text if we have time */
widget = glade_xml_get_widget (progress->priv->glade_xml, "progressbar_percentage");
if (remaining == 0) {
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (widget), NULL);
} else {
- time = pk_time_to_localised_string (remaining);
+ time = gpk_time_to_localised_string (remaining);
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (widget), time);
g_free (time);
}
}
/**
- * pk_progress_allow_cancel_cb:
+ * gpk_progress_allow_cancel_cb:
**/
static void
-pk_progress_allow_cancel_cb (PkClient *client, gboolean allow_cancel, PkProgress *progress)
+gpk_progress_allow_cancel_cb (PkClient *client, gboolean allow_cancel, GpkProgress *progress)
{
GtkWidget *widget;
widget = glade_xml_get_widget (progress->priv->glade_xml, "button_cancel");
@@ -428,34 +428,34 @@
}
/**
- * pk_progress_status_changed_cb:
+ * gpk_progress_status_changed_cb:
*/
static void
-pk_progress_status_changed_cb (PkClient *client, PkStatusEnum status, PkProgress *progress)
+gpk_progress_status_changed_cb (PkClient *client, PkStatusEnum status, GpkProgress *progress)
{
GtkWidget *widget;
const gchar *icon_name;
widget = glade_xml_get_widget (progress->priv->glade_xml, "label_status");
- gtk_label_set_label (GTK_LABEL (widget), pk_status_enum_to_localised_text (status));
+ gtk_label_set_label (GTK_LABEL (widget), gpk_status_enum_to_localised_text (status));
widget = glade_xml_get_widget (progress->priv->glade_xml, "image_status");
gtk_widget_show (widget);
- icon_name = pk_status_enum_to_icon_name (status);
+ icon_name = gpk_status_enum_to_icon_name (status);
gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name, GTK_ICON_SIZE_DIALOG);
pk_debug ("setting icon %s\n", icon_name);
}
/**
- * pk_progress_delete_event_cb:
+ * gpk_progress_delete_event_cb:
* @event: The event type, unused.
**/
static gboolean
-pk_progress_delete_event_cb (GtkWidget *widget,
+gpk_progress_delete_event_cb (GtkWidget *widget,
GdkEvent *event,
- PkProgress *progress)
+ GpkProgress *progress)
{
- pk_progress_clean_exit (progress);
+ gpk_progress_clean_exit (progress);
return FALSE;
}
@@ -482,7 +482,7 @@
}
/* backup */
- role_text = pk_role_enum_to_localised_present (role);
+ role_text = gpk_role_enum_to_localised_present (role);
/* check to see if we have a package_id or just a search term */
if (pk_strzero (package_id)) {
@@ -498,10 +498,10 @@
}
/**
- * pk_progress_monitor_tid:
+ * gpk_progress_monitor_tid:
**/
gboolean
-pk_progress_monitor_tid (PkProgress *progress, const gchar *tid)
+gpk_progress_monitor_tid (GpkProgress *progress, const gchar *tid)
{
GtkWidget *widget;
PkStatusEnum status;
@@ -534,16 +534,16 @@
widget = glade_xml_get_widget (progress->priv->glade_xml, "button_cancel");
gtk_widget_set_sensitive (widget, allow_cancel);
- pk_progress_status_changed_cb (progress->priv->client, status, progress);
+ gpk_progress_status_changed_cb (progress->priv->client, status, progress);
/* coldplug */
ret = pk_client_get_progress (progress->priv->client, &percentage, &subpercentage, &elapsed, &remaining, NULL);
if (ret) {
- pk_progress_progress_changed_cb (progress->priv->client, percentage,
+ gpk_progress_progress_changed_cb (progress->priv->client, percentage,
subpercentage, elapsed, remaining, progress);
} else {
pk_warning ("GetProgress failed");
- pk_progress_progress_changed_cb (progress->priv->client,
+ gpk_progress_progress_changed_cb (progress->priv->client,
PK_CLIENT_PERCENTAGE_INVALID,
PK_CLIENT_PERCENTAGE_INVALID, 0, 0, progress);
}
@@ -551,7 +551,7 @@
/* do the best we can */
ret = pk_client_get_package (progress->priv->client, &text, NULL);
if (ret) {
- pk_progress_package_cb (progress->priv->client, 0, text, NULL, progress);
+ gpk_progress_package_cb (progress->priv->client, 0, text, NULL, progress);
}
widget = glade_xml_get_widget (progress->priv->glade_xml, "window_progress");
@@ -560,33 +560,33 @@
}
/**
- * pk_progress_init:
+ * gpk_progress_init:
**/
static void
-pk_progress_init (PkProgress *progress)
+gpk_progress_init (GpkProgress *progress)
{
GtkWidget *main_window;
GtkWidget *widget;
PkEnumList *role_list;
- progress->priv = PK_PROGRESS_GET_PRIVATE (progress);
+ progress->priv = GPK_PROGRESS_GET_PRIVATE (progress);
progress->priv->task_ended = FALSE;
progress->priv->no_percentage_evt = 0;
progress->priv->no_subpercentage_evt = 0;
progress->priv->client = pk_client_new ();
g_signal_connect (progress->priv->client, "error-code",
- G_CALLBACK (pk_progress_error_code_cb), progress);
+ G_CALLBACK (gpk_progress_error_code_cb), progress);
g_signal_connect (progress->priv->client, "finished",
- G_CALLBACK (pk_progress_finished_cb), progress);
+ G_CALLBACK (gpk_progress_finished_cb), progress);
g_signal_connect (progress->priv->client, "package",
- G_CALLBACK (pk_progress_package_cb), progress);
+ G_CALLBACK (gpk_progress_package_cb), progress);
g_signal_connect (progress->priv->client, "progress-changed",
- G_CALLBACK (pk_progress_progress_changed_cb), progress);
+ G_CALLBACK (gpk_progress_progress_changed_cb), progress);
g_signal_connect (progress->priv->client, "status-changed",
- G_CALLBACK (pk_progress_status_changed_cb), progress);
+ G_CALLBACK (gpk_progress_status_changed_cb), progress);
g_signal_connect (progress->priv->client, "allow-cancel",
- G_CALLBACK (pk_progress_allow_cancel_cb), progress);
+ G_CALLBACK (gpk_progress_allow_cancel_cb), progress);
progress->priv->glade_xml = glade_xml_new (PK_DATA "/gpk-progress.glade", NULL, NULL);
main_window = glade_xml_get_widget (progress->priv->glade_xml, "window_progress");
@@ -604,7 +604,7 @@
/* Get the main window quit */
g_signal_connect (main_window, "delete_event",
- G_CALLBACK (pk_progress_delete_event_cb), progress);
+ G_CALLBACK (gpk_progress_delete_event_cb), progress);
widget = glade_xml_get_widget (progress->priv->glade_xml, "hbox_percentage");
gtk_widget_hide (widget);
@@ -615,11 +615,11 @@
widget = glade_xml_get_widget (progress->priv->glade_xml, "button_help");
g_signal_connect (widget, "clicked",
- G_CALLBACK (pk_progress_help_cb), progress);
+ G_CALLBACK (gpk_progress_help_cb), progress);
widget = glade_xml_get_widget (progress->priv->glade_xml, "button_cancel");
g_signal_connect (widget, "clicked",
- G_CALLBACK (pk_progress_cancel_cb), progress);
+ G_CALLBACK (gpk_progress_cancel_cb), progress);
/* get actions */
role_list = pk_client_get_actions (progress->priv->client);
@@ -633,27 +633,27 @@
widget = glade_xml_get_widget (progress->priv->glade_xml, "button_hide");
g_signal_connect (widget, "clicked",
- G_CALLBACK (pk_progress_hide_cb), progress);
+ G_CALLBACK (gpk_progress_hide_cb), progress);
widget = glade_xml_get_widget (progress->priv->glade_xml, "button_help");
gtk_widget_set_sensitive (widget, FALSE);
}
/**
- * pk_progress_finalize:
+ * gpk_progress_finalize:
* @object: This graph class instance
**/
static void
-pk_progress_finalize (GObject *object)
+gpk_progress_finalize (GObject *object)
{
- PkProgress *progress;
+ GpkProgress *progress;
GtkWidget *widget;
g_return_if_fail (object != NULL);
g_return_if_fail (PK_IS_PROGRESS (object));
- progress = PK_PROGRESS (object);
- progress->priv = PK_PROGRESS_GET_PRIVATE (progress);
+ progress = GPK_PROGRESS (object);
+ progress->priv = GPK_PROGRESS_GET_PRIVATE (progress);
widget = glade_xml_get_widget (progress->priv->glade_xml, "window_progress");
gtk_widget_hide (widget);
@@ -661,18 +661,18 @@
g_object_unref (progress->priv->client);
g_object_unref (progress->priv->glade_xml);
- G_OBJECT_CLASS (pk_progress_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gpk_progress_parent_class)->finalize (object);
}
/**
- * pk_progress_new:
- * Return value: new PkProgress instance.
+ * gpk_progress_new:
+ * Return value: new GpkProgress instance.
**/
-PkProgress *
-pk_progress_new (void)
+GpkProgress *
+gpk_progress_new (void)
{
- PkProgress *progress;
- progress = g_object_new (PK_TYPE_PROGRESS, NULL);
- return PK_PROGRESS (progress);
+ GpkProgress *progress;
+ progress = g_object_new (GPK_TYPE_PROGRESS, NULL);
+ return GPK_PROGRESS (progress);
}
Modified: trunk/src/gpk-progress.h
==============================================================================
--- trunk/src/gpk-progress.h (original)
+++ trunk/src/gpk-progress.h Tue Apr 1 23:21:47 2008
@@ -19,38 +19,38 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __PK_PROGRESS_H
-#define __PK_PROGRESS_H
+#ifndef __GPK_PROGRESS_H
+#define __GPK_PROGRESS_H
#include <glib-object.h>
G_BEGIN_DECLS
-#define PK_TYPE_PROGRESS (pk_progress_get_type ())
-#define PK_PROGRESS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PK_TYPE_PROGRESS, PkProgress))
-#define PK_PROGRESS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), PK_TYPE_PROGRESS, PkProgressClass))
-#define PK_IS_PROGRESS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PK_TYPE_PROGRESS))
-#define PK_IS_PROGRESS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), PK_TYPE_PROGRESS))
-#define PK_PROGRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PK_TYPE_PROGRESS, PkProgressClass))
+#define GPK_TYPE_PROGRESS (gpk_progress_get_type ())
+#define GPK_PROGRESS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GPK_TYPE_PROGRESS, GpkProgress))
+#define GPK_PROGRESS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GPK_TYPE_PROGRESS, GpkProgressClass))
+#define PK_IS_PROGRESS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GPK_TYPE_PROGRESS))
+#define PK_IS_PROGRESS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GPK_TYPE_PROGRESS))
+#define GPK_PROGRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GPK_TYPE_PROGRESS, GpkProgressClass))
-typedef struct PkProgressPrivate PkProgressPrivate;
+typedef struct GpkProgressPrivate GpkProgressPrivate;
typedef struct
{
GObject parent;
- PkProgressPrivate *priv;
-} PkProgress;
+ GpkProgressPrivate *priv;
+} GpkProgress;
typedef struct
{
GObjectClass parent_class;
-} PkProgressClass;
+} GpkProgressClass;
-GType pk_progress_get_type (void);
-PkProgress *pk_progress_new (void);
-gboolean pk_progress_monitor_tid (PkProgress *progress,
+GType gpk_progress_get_type (void);
+GpkProgress *gpk_progress_new (void);
+gboolean gpk_progress_monitor_tid (GpkProgress *progress,
const gchar *tid);
G_END_DECLS
-#endif /* __PK_PROGRESS_H */
+#endif /* __GPK_PROGRESS_H */
Modified: trunk/src/gpk-repo.c
==============================================================================
--- trunk/src/gpk-repo.c (original)
+++ trunk/src/gpk-repo.c Tue Apr 1 23:21:47 2008
@@ -43,7 +43,7 @@
static GtkListStore *list_store = NULL;
static PkClient *client = NULL;
static PkEnumList *role_list;
-static PkStatusbar *statusbar;
+static GpkStatusbar *statusbar;
enum
{
@@ -59,7 +59,7 @@
static void
pk_button_help_cb (GtkWidget *widget, gboolean data)
{
- pk_show_help ("software-sources");
+ gpk_show_help ("software-sources");
}
/**
@@ -224,7 +224,7 @@
static void
pk_repo_status_changed_cb (PkClient *client, PkStatusEnum status, gpointer data)
{
- pk_statusbar_set_status (statusbar, status);
+ gpk_statusbar_set_status (statusbar, status);
}
/**
@@ -233,7 +233,7 @@
static void
pk_repo_error_code_cb (PkClient *client, PkErrorCodeEnum code, const gchar *details, gpointer data)
{
- pk_error_modal_dialog (pk_error_enum_to_localised_text (code), details);
+ gpk_error_modal_dialog (gpk_error_enum_to_localised_text (code), details);
}
/**
@@ -366,9 +366,9 @@
gtk_tree_view_columns_autosize (GTK_TREE_VIEW (widget));
/* use the in-statusbar for progress */
- statusbar = pk_statusbar_new ();
+ statusbar = gpk_statusbar_new ();
widget = glade_xml_get_widget (glade_xml, "statusbar_status");
- pk_statusbar_set_widget (statusbar, widget);
+ gpk_statusbar_set_widget (statusbar, widget);
if (pk_enum_list_contains (role_list, PK_ROLE_ENUM_GET_REPO_LIST)) {
/* get the update list */
Modified: trunk/src/gpk-statusbar.c
==============================================================================
--- trunk/src/gpk-statusbar.c (original)
+++ trunk/src/gpk-statusbar.c Tue Apr 1 23:21:47 2008
@@ -40,13 +40,13 @@
#include "gpk-statusbar.h"
#include "gpk-common.h"
-static void pk_statusbar_class_init (PkStatusbarClass *klass);
-static void pk_statusbar_init (PkStatusbar *sbar);
-static void pk_statusbar_finalize (GObject *object);
+static void gpk_statusbar_class_init (GpkStatusbarClass *klass);
+static void gpk_statusbar_init (GpkStatusbar *sbar);
+static void gpk_statusbar_finalize (GObject *object);
-#define PK_STATUSBAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PK_TYPE_STATUSBAR, PkStatusbarPrivate))
+#define GPK_STATUSBAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPK_TYPE_STATUSBAR, GpkStatusbarPrivate))
-struct PkStatusbarPrivate
+struct GpkStatusbarPrivate
{
guint timer_id;
guint last_remaining;
@@ -55,25 +55,25 @@
GtkProgressBar *progressbar;
};
-G_DEFINE_TYPE (PkStatusbar, pk_statusbar, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GpkStatusbar, gpk_statusbar, G_TYPE_OBJECT)
/**
- * pk_statusbar_class_init:
- * @klass: The PkStatusbarClass
+ * gpk_statusbar_class_init:
+ * @klass: The GpkStatusbarClass
**/
static void
-pk_statusbar_class_init (PkStatusbarClass *klass)
+gpk_statusbar_class_init (GpkStatusbarClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = pk_statusbar_finalize;
- g_type_class_add_private (klass, sizeof (PkStatusbarPrivate));
+ object_class->finalize = gpk_statusbar_finalize;
+ g_type_class_add_private (klass, sizeof (GpkStatusbarPrivate));
}
/**
- * pk_statusbar_set_widget:
+ * gpk_statusbar_set_widget:
**/
gboolean
-pk_statusbar_set_widget (PkStatusbar *sbar, GtkWidget *widget)
+gpk_statusbar_set_widget (GpkStatusbar *sbar, GtkWidget *widget)
{
GtkWidget *hbox;
GtkWidget *icon_container;
@@ -110,21 +110,21 @@
}
/**
- * pk_statusbar_pulse_timeout:
+ * gpk_statusbar_pulse_timeout:
**/
static gboolean
-pk_statusbar_pulse_timeout (gpointer data)
+gpk_statusbar_pulse_timeout (gpointer data)
{
- PkStatusbar *sbar = (PkStatusbar *) data;
+ GpkStatusbar *sbar = (GpkStatusbar *) data;
gtk_progress_bar_pulse (sbar->priv->progressbar);
return TRUE;
}
/**
- * pk_statusbar_set_percentage:
+ * gpk_statusbar_set_percentage:
**/
gboolean
-pk_statusbar_set_percentage (PkStatusbar *sbar, guint percentage)
+gpk_statusbar_set_percentage (GpkStatusbar *sbar, guint percentage)
{
g_return_val_if_fail (sbar != NULL, FALSE);
g_return_val_if_fail (PK_IS_STATUSBAR (sbar), FALSE);
@@ -138,8 +138,8 @@
if (sbar->priv->timer_id != 0) {
return TRUE;
}
- sbar->priv->timer_id = g_timeout_add (PK_PROGRESS_BAR_PULSE_DELAY,
- pk_statusbar_pulse_timeout, sbar);
+ sbar->priv->timer_id = g_timeout_add (GPK_PROGRESS_BAR_PULSE_DELAY,
+ gpk_statusbar_pulse_timeout, sbar);
sbar->priv->last_percentage = percentage;
return TRUE;
}
@@ -162,10 +162,10 @@
}
/**
- * pk_statusbar_set_status:
+ * gpk_statusbar_set_status:
**/
gboolean
-pk_statusbar_set_status (PkStatusbar *sbar, PkStatusEnum status)
+gpk_statusbar_set_status (GpkStatusbar *sbar, PkStatusEnum status)
{
const gchar *text;
@@ -174,17 +174,17 @@
g_return_val_if_fail (sbar->priv->statusbar != NULL, FALSE);
/* set the status */
- text = pk_status_enum_to_localised_text (status);
+ text = gpk_status_enum_to_localised_text (status);
gtk_label_set_label (GTK_LABEL (sbar->priv->statusbar->label), text);
return TRUE;
}
/**
- * pk_statusbar_set_remaining:
+ * gpk_statusbar_set_remaining:
**/
gboolean
-pk_statusbar_set_remaining (PkStatusbar *sbar, guint remaining)
+gpk_statusbar_set_remaining (GpkStatusbar *sbar, guint remaining)
{
gchar *time;
gchar *text;
@@ -209,7 +209,7 @@
gtk_widget_show (GTK_WIDGET (sbar->priv->statusbar->label));
/* print remaining time */
- time = pk_time_to_localised_string (remaining);
+ time = gpk_time_to_localised_string (remaining);
text = g_strdup_printf (_("Remaining time: %s"), time);
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (sbar->priv->progressbar), text);
g_free (time);
@@ -219,10 +219,10 @@
}
/**
- * pk_statusbar_hide:
+ * gpk_statusbar_hide:
**/
gboolean
-pk_statusbar_hide (PkStatusbar *sbar)
+gpk_statusbar_hide (GpkStatusbar *sbar)
{
g_return_val_if_fail (sbar != NULL, FALSE);
g_return_val_if_fail (PK_IS_STATUSBAR (sbar), FALSE);
@@ -238,35 +238,35 @@
}
/**
- * pk_statusbar_init:
+ * gpk_statusbar_init:
* @statusbar: This class instance
**/
static void
-pk_statusbar_init (PkStatusbar *sbar)
+gpk_statusbar_init (GpkStatusbar *sbar)
{
- sbar->priv = PK_STATUSBAR_GET_PRIVATE (sbar);
+ sbar->priv = GPK_STATUSBAR_GET_PRIVATE (sbar);
sbar->priv->timer_id = 0;
sbar->priv->last_percentage = PK_CLIENT_PERCENTAGE_INVALID;
sbar->priv->last_remaining = 0;
sbar->priv->progressbar = GTK_PROGRESS_BAR (gtk_progress_bar_new ());
gtk_progress_bar_set_fraction (sbar->priv->progressbar, 0.0);
- gtk_progress_bar_set_pulse_step (sbar->priv->progressbar, PK_PROGRESS_BAR_PULSE_STEP);
+ gtk_progress_bar_set_pulse_step (sbar->priv->progressbar, GPK_PROGRESS_BAR_PULSE_STEP);
}
/**
- * pk_statusbar_finalize:
+ * gpk_statusbar_finalize:
* @object: The object to finalize
**/
static void
-pk_statusbar_finalize (GObject *object)
+gpk_statusbar_finalize (GObject *object)
{
- PkStatusbar *sbar;
+ GpkStatusbar *sbar;
g_return_if_fail (object != NULL);
g_return_if_fail (PK_IS_STATUSBAR (object));
- sbar = PK_STATUSBAR (object);
+ sbar = GPK_STATUSBAR (object);
g_return_if_fail (sbar->priv != NULL);
/* don't spin anymore */
@@ -274,19 +274,19 @@
g_source_remove (sbar->priv->timer_id);
}
- G_OBJECT_CLASS (pk_statusbar_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gpk_statusbar_parent_class)->finalize (object);
}
/**
- * pk_statusbar_new:
+ * gpk_statusbar_new:
*
- * Return value: a new PkStatusbar object.
+ * Return value: a new GpkStatusbar object.
**/
-PkStatusbar *
-pk_statusbar_new (void)
+GpkStatusbar *
+gpk_statusbar_new (void)
{
- PkStatusbar *sbar;
- sbar = g_object_new (PK_TYPE_STATUSBAR, NULL);
- return PK_STATUSBAR (sbar);
+ GpkStatusbar *sbar;
+ sbar = g_object_new (GPK_TYPE_STATUSBAR, NULL);
+ return GPK_STATUSBAR (sbar);
}
Modified: trunk/src/gpk-statusbar.h
==============================================================================
--- trunk/src/gpk-statusbar.h (original)
+++ trunk/src/gpk-statusbar.h Tue Apr 1 23:21:47 2008
@@ -19,48 +19,48 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __PK_STATUSBAR_H
-#define __PK_STATUSBAR_H
+#ifndef __GPK_STATUSBAR_H
+#define __GPK_STATUSBAR_H
#include <glib-object.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
-#define PK_TYPE_STATUSBAR (pk_statusbar_get_type ())
-#define PK_STATUSBAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PK_TYPE_STATUSBAR, PkStatusbar))
-#define PK_STATUSBAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), PK_TYPE_STATUSBAR, PkStatusbarClass))
-#define PK_IS_STATUSBAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PK_TYPE_STATUSBAR))
-#define PK_IS_STATUSBAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), PK_TYPE_STATUSBAR))
-#define PK_STATUSBAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PK_TYPE_STATUSBAR, PkStatusbarClass))
-#define PK_STATUSBAR_ERROR (pk_statusbar_error_quark ())
-#define PK_STATUSBAR_TYPE_ERROR (pk_statusbar_error_get_type ())
+#define GPK_TYPE_STATUSBAR (gpk_statusbar_get_type ())
+#define GPK_STATUSBAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GPK_TYPE_STATUSBAR, GpkStatusbar))
+#define GPK_STATUSBAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GPK_TYPE_STATUSBAR, GpkStatusbarClass))
+#define PK_IS_STATUSBAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GPK_TYPE_STATUSBAR))
+#define PK_IS_STATUSBAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GPK_TYPE_STATUSBAR))
+#define GPK_STATUSBAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GPK_TYPE_STATUSBAR, GpkStatusbarClass))
+#define GPK_STATUSBAR_ERROR (gpk_statusbar_error_quark ())
+#define GPK_STATUSBAR_TYPE_ERROR (gpk_statusbar_error_get_type ())
-typedef struct PkStatusbarPrivate PkStatusbarPrivate;
+typedef struct GpkStatusbarPrivate GpkStatusbarPrivate;
typedef struct
{
GObject parent;
- PkStatusbarPrivate *priv;
-} PkStatusbar;
+ GpkStatusbarPrivate *priv;
+} GpkStatusbar;
typedef struct
{
GObjectClass parent_class;
-} PkStatusbarClass;
+} GpkStatusbarClass;
-GType pk_statusbar_get_type (void);
-PkStatusbar *pk_statusbar_new (void);
-gboolean pk_statusbar_set_widget (PkStatusbar *arefresh,
+GType gpk_statusbar_get_type (void);
+GpkStatusbar *gpk_statusbar_new (void);
+gboolean gpk_statusbar_set_widget (GpkStatusbar *arefresh,
GtkWidget *widget);
-gboolean pk_statusbar_set_percentage (PkStatusbar *arefresh,
+gboolean gpk_statusbar_set_percentage (GpkStatusbar *arefresh,
guint percentage);
-gboolean pk_statusbar_set_status (PkStatusbar *arefresh,
+gboolean gpk_statusbar_set_status (GpkStatusbar *arefresh,
PkStatusEnum status);
-gboolean pk_statusbar_hide (PkStatusbar *arefresh);
-gboolean pk_statusbar_set_remaining (PkStatusbar *arefresh,
+gboolean gpk_statusbar_hide (GpkStatusbar *arefresh);
+gboolean gpk_statusbar_set_remaining (GpkStatusbar *arefresh,
guint remaining);
G_END_DECLS
-#endif /* __PK_STATUSBAR_H */
+#endif /* __GPK_STATUSBAR_H */
Modified: trunk/src/gpk-update-viewer.c
==============================================================================
--- trunk/src/gpk-update-viewer.c (original)
+++ trunk/src/gpk-update-viewer.c Tue Apr 1 23:21:47 2008
@@ -112,9 +112,11 @@
* pk_button_help_cb:
**/
static void
-pk_button_help_cb (GtkWidget *widget, gboolean data)
+pk_button_help_cb (GtkWidget *widget, gpointer data)
{
- pk_show_help ("update-viewer");
+ const char *id = data;
+
+ gpk_show_help (id);
}
/**
@@ -237,7 +239,7 @@
/* we have no checkboxes selected */
if (!selected_any) {
- pk_error_modal_dialog (_("No updates selected"), _("No updates are selected"));
+ gpk_error_modal_dialog (_("No updates selected"), _("No updates are selected"));
return;
}
@@ -263,7 +265,7 @@
/* update a list */
ret = pk_client_update_packages_strv (client_action, package_ids, &error);
if (!ret) {
- pk_error_modal_dialog ("Individual updates failed", error->message);
+ gpk_error_modal_dialog ("Individual updates failed", error->message);
g_error_free (error);
}
g_strfreev (package_ids);
@@ -498,7 +500,7 @@
}
ret = pk_client_refresh_cache (client_action, TRUE, &error);
if (ret == FALSE) {
- pk_error_modal_dialog (_("Failed to refresh"), error->message);
+ gpk_error_modal_dialog (_("Failed to refresh"), error->message);
g_error_free (error);
return;
}
@@ -524,7 +526,7 @@
/* FIXME: do this in process */
if (!g_spawn_command_line_async ("gpk-log", &error)) {
- pk_error_modal_dialog (_("Failed to launch gpk-log"),
+ gpk_error_modal_dialog (_("Failed to launch gpk-log"),
error->message);
g_error_free (error);
}
@@ -661,8 +663,8 @@
pk_info_enum_to_text (info), package_id, summary);
if (role == PK_ROLE_ENUM_GET_UPDATES) {
- text = pk_package_id_pretty (package_id, summary);
- icon_name = pk_info_enum_to_icon_name (info);
+ text = gpk_package_id_pretty (package_id, summary);
+ icon_name = gpk_info_enum_to_icon_name (info);
gtk_list_store_append (list_store_details, &iter);
gtk_list_store_set (list_store_details, &iter,
PACKAGES_COLUMN_TEXT, text,
@@ -677,7 +679,7 @@
if (role == PK_ROLE_ENUM_UPDATE_SYSTEM ||
role == PK_ROLE_ENUM_UPDATE_PACKAGES) {
- text = pk_package_id_pretty (package_id, summary);
+ text = gpk_package_id_pretty (package_id, summary);
widget = glade_xml_get_widget (glade_xml, "progress_package_label");
gtk_label_set_markup (GTK_LABEL (widget), text);
@@ -789,24 +791,24 @@
info = PK_INFO_ENUM_NORMAL;
}
- info_text = pk_info_enum_to_localised_text (info);
+ info_text = gpk_info_enum_to_localised_text (info);
/* translators: this is the update type, e.g. security */
pk_updates_add_description_item (_("Type"), info_text, NULL);
- package_pretty = pk_package_id_name_version (package_id);
+ package_pretty = gpk_package_id_name_version (package_id);
/* translators: this is the package version */
pk_updates_add_description_item (_("Version"), package_pretty, NULL);
g_free (package_pretty);
if (!pk_strzero (updates)) {
- updates_pretty = pk_package_id_name_version (updates);
+ updates_pretty = gpk_package_id_name_version (updates);
/* translators: this is a list of packages that are updated */
pk_updates_add_description_item (_("Updates"), updates_pretty, NULL);
g_free (updates_pretty);
}
if (!pk_strzero (obsoletes)) {
- obsoletes_pretty = pk_package_id_name_version (obsoletes);
+ obsoletes_pretty = gpk_package_id_name_version (obsoletes);
/* translators: this is a list of packages that are obsoleted */
pk_updates_add_description_item (_("Obsoletes"), obsoletes_pretty, NULL);
g_free (obsoletes_pretty);
@@ -861,7 +863,7 @@
}
widget = glade_xml_get_widget (glade_xml, "progress_part_label");
- text = g_strdup_printf ("<b>%s</b>", pk_status_enum_to_localised_text (status));
+ text = g_strdup_printf ("<b>%s</b>", gpk_status_enum_to_localised_text (status));
gtk_label_set_markup (GTK_LABEL (widget), text);
g_free (text);
@@ -949,7 +951,7 @@
pk_treeview_renderer_clicked (GtkCellRendererToggle *cell, gchar *uri, gpointer data)
{
pk_debug ("clicked %s", uri);
- pk_execute_url (uri);
+ gpk_execute_url (uri);
}
/**
@@ -974,7 +976,7 @@
gtk_tree_view_append_column (treeview, column);
/* column for uris */
- renderer = pk_cell_renderer_uri_new ();
+ renderer = gpk_cell_renderer_uri_new ();
g_signal_connect (renderer, "clicked", G_CALLBACK (pk_treeview_renderer_clicked), NULL);
column = gtk_tree_view_column_new_with_attributes (_("Text"), renderer,
"text", DESC_COLUMN_TEXT,
@@ -1166,7 +1168,7 @@
static void
pk_updates_restart_cb (GtkWidget *widget, gpointer data)
{
- pk_restart_system ();
+ gpk_restart_system ();
}
static void populate_preview (void);
@@ -1183,6 +1185,7 @@
GString *string;
gboolean exists = FALSE;
gchar *text;
+ gchar *title_bold;
GtkWidget *widget;
string = g_string_new ("");
@@ -1192,7 +1195,7 @@
for (i=0;i<length;i++) {
item = pk_client_package_buffer_get_item (client, i);
if (item->info == PK_INFO_ENUM_BLOCKED) {
- text = pk_package_id_pretty_oneline (item->package_id, item->summary);
+ text = gpk_package_id_pretty_oneline (item->package_id, item->summary);
g_string_append_printf (string, "%s\n", text);
g_free (text);
exists = TRUE;
@@ -1210,14 +1213,18 @@
/* set the widget text */
if (exists) {
widget = glade_xml_get_widget (glade_xml, "label_update_title");
- gtk_label_set_markup (GTK_LABEL (widget), _("<b>Some updates were not updated</b>"));
+ title_bold = g_strdup_printf ("<b>%s</b>", _("Some updates were not updated"));
+ gtk_label_set_markup (GTK_LABEL (widget), title_bold);
+ g_free (title_bold);
widget = glade_xml_get_widget (glade_xml, "label_update_notice");
gtk_label_set_markup (GTK_LABEL (widget), text);
gtk_widget_show (widget);
} else {
widget = glade_xml_get_widget (glade_xml, "label_update_title");
- gtk_label_set_markup (GTK_LABEL (widget), _("<b>System Update Completed</b>"));
+ title_bold = g_strdup_printf ("<b>%s</b>", _("System update completed"));
+ gtk_label_set_markup (GTK_LABEL (widget), title_bold);
+ g_free (title_bold);
widget = glade_xml_get_widget (glade_xml, "label_update_notice");
gtk_widget_hide (widget);
@@ -1387,38 +1394,38 @@
/* add to preview box in order of priority */
if (num_security > 0) {
- icon = pk_info_enum_to_icon_name (PK_INFO_ENUM_SECURITY);
- text = pk_update_enum_to_localised_text (PK_INFO_ENUM_SECURITY, num_security);
+ icon = gpk_info_enum_to_icon_name (PK_INFO_ENUM_SECURITY);
+ text = gpk_update_enum_to_localised_text (PK_INFO_ENUM_SECURITY, num_security);
pk_updates_add_preview_item (icon, text, FALSE);
g_free (text);
}
if (num_important > 0) {
- icon = pk_info_enum_to_icon_name (PK_INFO_ENUM_IMPORTANT);
- text = pk_update_enum_to_localised_text (PK_INFO_ENUM_IMPORTANT, num_important);
+ icon = gpk_info_enum_to_icon_name (PK_INFO_ENUM_IMPORTANT);
+ text = gpk_update_enum_to_localised_text (PK_INFO_ENUM_IMPORTANT, num_important);
pk_updates_add_preview_item (icon, text, FALSE);
g_free (text);
}
if (num_bugfix > 0) {
- icon = pk_info_enum_to_icon_name (PK_INFO_ENUM_BUGFIX);
- text = pk_update_enum_to_localised_text (PK_INFO_ENUM_BUGFIX, num_bugfix);
+ icon = gpk_info_enum_to_icon_name (PK_INFO_ENUM_BUGFIX);
+ text = gpk_update_enum_to_localised_text (PK_INFO_ENUM_BUGFIX, num_bugfix);
pk_updates_add_preview_item (icon, text, FALSE);
g_free (text);
}
if (num_enhancement > 0) {
- icon = pk_info_enum_to_icon_name (PK_INFO_ENUM_ENHANCEMENT);
- text = pk_update_enum_to_localised_text (PK_INFO_ENUM_ENHANCEMENT, num_enhancement);
+ icon = gpk_info_enum_to_icon_name (PK_INFO_ENUM_ENHANCEMENT);
+ text = gpk_update_enum_to_localised_text (PK_INFO_ENUM_ENHANCEMENT, num_enhancement);
pk_updates_add_preview_item (icon, text, FALSE);
g_free (text);
}
if (num_low > 0) {
- icon = pk_info_enum_to_icon_name (PK_INFO_ENUM_LOW);
- text = pk_update_enum_to_localised_text (PK_INFO_ENUM_LOW, num_low);
+ icon = gpk_info_enum_to_icon_name (PK_INFO_ENUM_LOW);
+ text = gpk_update_enum_to_localised_text (PK_INFO_ENUM_LOW, num_low);
pk_updates_add_preview_item (icon, text, FALSE);
g_free (text);
}
if (num_normal > 0) {
- icon = pk_info_enum_to_icon_name (PK_INFO_ENUM_NORMAL);
- text = pk_update_enum_to_localised_text (PK_INFO_ENUM_NORMAL, num_normal);
+ icon = gpk_info_enum_to_icon_name (PK_INFO_ENUM_NORMAL);
+ text = gpk_update_enum_to_localised_text (PK_INFO_ENUM_NORMAL, num_normal);
pk_updates_add_preview_item (icon, text, FALSE);
g_free (text);
}
@@ -1492,13 +1499,13 @@
/* set bold title */
widget = glade_xml_get_widget (glade_xml, "label_error_title");
- title = pk_error_enum_to_localised_text (code);
+ title = gpk_error_enum_to_localised_text (code);
title_bold = g_strdup_printf ("<b>%s</b>", title);
gtk_label_set_label (GTK_LABEL (widget), title_bold);
g_free (title_bold);
widget = glade_xml_get_widget (glade_xml, "label_error_message");
- gtk_label_set_label (GTK_LABEL (widget), pk_error_enum_to_localised_message (code));
+ gtk_label_set_label (GTK_LABEL (widget), gpk_error_enum_to_localised_message (code));
widget = glade_xml_get_widget (glade_xml, "label_error_details");
details_safe = g_markup_escape_text (details, -1);
@@ -1637,11 +1644,8 @@
g_signal_connect (pconnection, "connection-changed",
G_CALLBACK (pk_connection_changed_cb), NULL);
- /* we need to grey out all the buttons if we are in progress */
+ /* monitor for other updates in progress */
tlist = pk_task_list_new ();
- g_signal_connect (tlist, "task-list-changed",
- G_CALLBACK (pk_updates_task_list_changed_cb), NULL);
- pk_updates_task_list_changed_cb (tlist, NULL);
glade_xml = glade_xml_new (PK_DATA "/gpk-update-viewer.glade", NULL, NULL);
main_window = glade_xml_get_widget (glade_xml, "window_updates");
@@ -1789,7 +1793,11 @@
widget = glade_xml_get_widget (glade_xml, "button_help");
g_signal_connect (widget, "clicked",
- G_CALLBACK (pk_button_help_cb), NULL);
+ G_CALLBACK (pk_button_help_cb), "update-viewer");
+
+ widget = glade_xml_get_widget (glade_xml, "button_help2");
+ g_signal_connect (widget, "clicked",
+ G_CALLBACK (pk_button_help_cb), "update-viewer-details");
/* create list stores */
list_store_details = gtk_list_store_new (PACKAGES_COLUMN_LAST, G_TYPE_STRING,
@@ -1851,6 +1859,11 @@
widget = glade_xml_get_widget (glade_xml, "progress_package_label");
gtk_label_set_label (GTK_LABEL (widget), "");
+ /* we need to grey out all the buttons if we are in progress */
+ g_signal_connect (tlist, "task-list-changed",
+ G_CALLBACK (pk_updates_task_list_changed_cb), NULL);
+ pk_updates_task_list_changed_cb (tlist, NULL);
+
/* get the update list */
ret = pk_client_get_updates (client_query, "basename", NULL);
if (ret) {
Modified: trunk/src/gpk-watch.c
==============================================================================
--- trunk/src/gpk-watch.c (original)
+++ trunk/src/gpk-watch.c Tue Apr 1 23:21:47 2008
@@ -65,7 +65,7 @@
PkClient *client;
GpkSmartIcon *sicon;
GpkSmartIcon *sicon_restart;
- PkInhibit *inhibit;
+ GpkInhibit *inhibit;
PkConnection *pconnection;
PkTaskList *tlist;
GConfClient *gconf_client;
@@ -116,21 +116,23 @@
pk_warning ("not found item %i", i);
break;
}
- localised_status = pk_status_enum_to_localised_text (item->status);
+ localised_status = gpk_status_enum_to_localised_text (item->status);
- /* we have text? */
- if (pk_strzero (item->package_id)) {
+ /* should we display the text */
+ if (item->role == PK_ROLE_ENUM_UPDATE_PACKAGES ||
+ pk_strzero (item->package_id)) {
g_string_append_printf (status, "%s\n", localised_status);
} else {
/* display the package name, not the package_id */
- text = pk_package_get_name (item->package_id);
+ text = gpk_package_get_name (item->package_id);
g_string_append_printf (status, "%s: %s\n", localised_status, text);
g_free (text);
}
/* don't fill the screen with a giant tooltip */
if (i > GPK_WATCH_MAXIMUM_TOOLTIP_LINES) {
- g_string_append_printf (status, _("(%i more transactions)\n"),
+ g_string_append_printf (status, _("(%i more tasks)"),
i - GPK_WATCH_MAXIMUM_TOOLTIP_LINES);
+ g_string_append_c (status, '\n');
break;
}
}
@@ -226,7 +228,7 @@
/* only set if in the list and not unknown */
if (value != PK_STATUS_ENUM_UNKNOWN && value != -1) {
- icon = pk_status_enum_to_icon_name (value);
+ icon = gpk_status_enum_to_icon_name (value);
gpk_smart_icon_set_icon_name (watch->priv->sicon, icon);
}
@@ -264,6 +266,7 @@
gboolean value;
PkRoleEnum role;
PkRestartEnum restart;
+ GError *error = NULL;
gchar *package_id;
gchar *message = NULL;
gchar *package;
@@ -275,7 +278,7 @@
/* get the role */
ret = pk_client_get_role (client, &role, &package_id, NULL);
- if (ret == FALSE) {
+ if (!ret) {
pk_warning ("cannot get role");
return;
}
@@ -288,8 +291,8 @@
restart = pk_client_get_require_restart (client);
if (restart == PK_RESTART_ENUM_SYSTEM ||
restart == PK_RESTART_ENUM_SESSION) {
- restart_message = pk_restart_enum_to_localised_text (restart);
- icon_name = pk_restart_enum_to_icon_name (restart);
+ restart_message = gpk_restart_enum_to_localised_text (restart);
+ icon_name = gpk_restart_enum_to_icon_name (restart);
gpk_smart_icon_set_tooltip (watch->priv->sicon_restart, restart_message);
gpk_smart_icon_set_icon_name (watch->priv->sicon_restart, icon_name);
}
@@ -308,18 +311,30 @@
}
/* are we accepting notifications */
- value = gconf_client_get_bool (watch->priv->gconf_client, PK_CONF_NOTIFY_COMPLETED, NULL);
- if (value == FALSE) {
+ value = gconf_client_get_bool (watch->priv->gconf_client, GPK_CONF_NOTIFY_COMPLETED, NULL);
+ if (!value) {
pk_debug ("not showing notification as prevented in gconf");
return;
}
+ /* is caller able to handle the messages itself? */
+ ret = pk_client_is_caller_active (client, &value, &error);
+ if (!ret) {
+ pk_warning ("could not get caller active status: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+ if (value) {
+ pk_debug ("not showing notification as caller is still present");
+ return;
+ }
+
if (role == PK_ROLE_ENUM_REMOVE_PACKAGE) {
- package = pk_package_get_name (package_id);
+ package = gpk_package_get_name (package_id);
message = g_strdup_printf (_("Package '%s' has been removed"), package);
g_free (package);
} else if (role == PK_ROLE_ENUM_INSTALL_PACKAGE) {
- package = pk_package_get_name (package_id);
+ package = gpk_package_get_name (package_id);
message = g_strdup_printf (_("Package '%s' has been installed"), package);
g_free (package);
} else if (role == PK_ROLE_ENUM_UPDATE_SYSTEM) {
@@ -334,7 +349,7 @@
/* libnotify dialog */
gpk_smart_icon_notify_new (watch->priv->sicon, _("Task completed"), message,
"help-browser", GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_SHORT);
- gpk_smart_icon_notify_button (watch->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, PK_CONF_NOTIFY_COMPLETED);
+ gpk_smart_icon_notify_button (watch->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_COMPLETED);
gpk_smart_icon_notify_show (watch->priv->sicon);
g_free (message);
g_free (package_id);
@@ -354,7 +369,7 @@
g_return_if_fail (watch != NULL);
g_return_if_fail (GPK_IS_WATCH (watch));
- title = pk_error_enum_to_localised_text (error_code);
+ title = gpk_error_enum_to_localised_text (error_code);
/* if the client dbus connection is still active */
pk_client_is_caller_active (client, &is_active, NULL);
@@ -375,8 +390,8 @@
}
/* are we accepting notifications */
- value = gconf_client_get_bool (watch->priv->gconf_client, PK_CONF_NOTIFY_ERROR, NULL);
- if (value == FALSE) {
+ value = gconf_client_get_bool (watch->priv->gconf_client, GPK_CONF_NOTIFY_ERROR, NULL);
+ if (!value) {
pk_debug ("not showing notification as prevented in gconf");
return;
}
@@ -386,7 +401,7 @@
gpk_smart_icon_notify_new (watch->priv->sicon, title, escaped_details, "help-browser",
GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_LONG);
- gpk_smart_icon_notify_button (watch->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, PK_CONF_NOTIFY_ERROR);
+ gpk_smart_icon_notify_button (watch->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_ERROR);
gpk_smart_icon_notify_show (watch->priv->sicon);
g_free (escaped_details);
}
@@ -406,21 +421,21 @@
g_return_if_fail (GPK_IS_WATCH (watch));
/* are we accepting notifications */
- value = gconf_client_get_bool (watch->priv->gconf_client, PK_CONF_NOTIFY_MESSAGE, NULL);
- if (value == FALSE) {
+ value = gconf_client_get_bool (watch->priv->gconf_client, GPK_CONF_NOTIFY_MESSAGE, NULL);
+ if (!value) {
pk_debug ("not showing notification as prevented in gconf");
return;
}
- title = pk_message_enum_to_localised_text (message);
- filename = pk_message_enum_to_icon_name (message);
+ title = gpk_message_enum_to_localised_text (message);
+ filename = gpk_message_enum_to_icon_name (message);
/* we need to format this */
escaped_details = g_markup_escape_text (details, -1);
gpk_smart_icon_notify_new (watch->priv->sicon, title, escaped_details, filename,
GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_NEVER);
- gpk_smart_icon_notify_button (watch->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, PK_CONF_NOTIFY_MESSAGE);
+ gpk_smart_icon_notify_button (watch->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_MESSAGE);
gpk_smart_icon_notify_show (watch->priv->sicon);
g_free (escaped_details);
}
@@ -460,7 +475,7 @@
ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
g_free (cmdline);
- if (ret == FALSE) {
+ if (!ret) {
error_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Failed to show url %s", error->message);
gtk_dialog_run (GTK_DIALOG (error_dialog));
gtk_widget_destroy (error_dialog);
@@ -588,7 +603,7 @@
static void
gpk_watch_restart_cb (PolKitGnomeAction *action, gpointer data)
{
- pk_restart_system ();
+ gpk_restart_system ();
}
/**
@@ -612,7 +627,7 @@
G_CALLBACK (gpk_watch_refresh_cache_finished_cb), watch);
ret = pk_client_refresh_cache (client, TRUE, NULL);
- if (ret == FALSE) {
+ if (!ret) {
g_object_unref (client);
message = g_strdup_printf (_("The error was: %s"), error->message);
pk_warning ("%s", message);
@@ -628,7 +643,7 @@
* pk_monitor_action_unref_cb:
**/
static void
-pk_monitor_action_unref_cb (PkProgress *progress, GpkWatch *watch)
+pk_monitor_action_unref_cb (GpkProgress *progress, GpkWatch *watch)
{
g_return_if_fail (watch != NULL);
g_return_if_fail (GPK_IS_WATCH (watch));
@@ -643,7 +658,7 @@
gpk_watch_menu_job_status_cb (GtkMenuItem *item, GpkWatch *watch)
{
gchar *tid;
- PkProgress *progress = NULL;
+ GpkProgress *progress = NULL;
g_return_if_fail (watch != NULL);
g_return_if_fail (GPK_IS_WATCH (watch));
@@ -652,10 +667,10 @@
tid = (gchar *) g_object_get_data (G_OBJECT (item), "tid");
/* launch the UI */
- progress = pk_progress_new ();
+ progress = gpk_progress_new ();
g_signal_connect (progress, "action-unref",
G_CALLBACK (pk_monitor_action_unref_cb), watch);
- pk_progress_monitor_tid (progress, tid);
+ gpk_progress_monitor_tid (progress, tid);
}
/**
@@ -690,12 +705,12 @@
pk_warning ("not found item %i", i);
break;
}
- localised_role = pk_role_enum_to_localised_present (item->role);
- localised_status = pk_status_enum_to_localised_text (item->status);
+ localised_role = gpk_role_enum_to_localised_present (item->role);
+ localised_status = gpk_status_enum_to_localised_text (item->status);
- icon_name = pk_status_enum_to_icon_name (item->status);
+ icon_name = gpk_status_enum_to_icon_name (item->status);
if (pk_strzero (item->package_id) == FALSE) {
- package = pk_package_get_name (item->package_id);
+ package = gpk_package_get_name (item->package_id);
text = g_strdup_printf ("%s %s (%s)", localised_role, package, localised_status);
g_free (package);
} else {
@@ -705,7 +720,7 @@
/* add a job */
widget = gtk_image_menu_item_new_with_mnemonic (text);
- /* we need the job ID so we know what PkProgress to show */
+ /* we need the job ID so we know what GpkProgress to show */
g_object_set_data (G_OBJECT (widget), "tid", (gpointer) item->tid);
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
@@ -842,9 +857,9 @@
pk_debug ("setting locked %i, doing g-p-m (un)inhibit", is_locked);
if (is_locked) {
- pk_inhibit_create (watch->priv->inhibit);
+ gpk_inhibit_create (watch->priv->inhibit);
} else {
- pk_inhibit_remove (watch->priv->inhibit);
+ gpk_inhibit_remove (watch->priv->inhibit);
}
}
@@ -879,7 +894,7 @@
G_CALLBACK (gpk_watch_message_cb), watch);
/* do session inhibit */
- watch->priv->inhibit = pk_inhibit_new ();
+ watch->priv->inhibit = gpk_inhibit_new ();
/* right click actions are common */
status_icon = gpk_smart_icon_get_status_icon (watch->priv->sicon);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
