[gnome-packagekit] Remove user help



commit d3bbcb4cb02b3ad6f0e9d3ae4688dcdcfc6d60eb
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Jun 29 12:10:14 2014 -0500

    Remove user help
    
    This may or may not be temporary, but the user help is so outdated that
    it's no longer reasonable to keep it around.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=732402

 Makefile.am                                   |    3 +-
 configure.ac                                  |   14 -
 data/gpk-application.ui                       |    4 -
 data/gpk-client.ui                            |   17 -
 data/gpk-eula.ui                              |   16 -
 data/gpk-log.ui                               |   17 -
 data/gpk-prefs.ui                             |   18 -
 data/gpk-signature.ui                         |   17 -
 help/.gitignore                               |    7 -
 help/C/.gitignore                             |    2 -
 help/C/figures/.gitignore                     |    2 -
 help/C/figures/gpk-added-deps.png             |  Bin 40850 -> 0 bytes
 help/C/figures/gpk-application-groups.png     |  Bin 112158 -> 0 bytes
 help/C/figures/gpk-client-codecs.png          |  Bin 26396 -> 0 bytes
 help/C/figures/gpk-client-copy-local.png      |  Bin 20296 -> 0 bytes
 help/C/figures/gpk-eula.png                   |  Bin 35167 -> 0 bytes
 help/C/figures/gpk-log.png                    |  Bin 44282 -> 0 bytes
 help/C/figures/gpk-prefs.png                  |  Bin 24802 -> 0 bytes
 help/C/figures/gpk-remove-confirm.png         |  Bin 75829 -> 0 bytes
 help/C/figures/gpk-repo-auth.png              |  Bin 29298 -> 0 bytes
 help/C/figures/gpk-repo.png                   |  Bin 23266 -> 0 bytes
 help/C/figures/gpk-signature.png              |  Bin 26993 -> 0 bytes
 help/C/figures/gpk-updates-overview.png       |  Bin 66312 -> 0 bytes
 help/C/figures/gpk-updates-warning.png        |  Bin 41571 -> 0 bytes
 help/C/figures/gpk-updates.png                |  Bin 83421 -> 0 bytes
 help/C/figures/update.sh                      |    6 -
 help/C/index.docbook                          |  900 ------------
 help/C/legal.xml                              |   76 -
 help/Makefile.am                              |   22 -
 help/de/.gitignore                            |    4 -
 help/de/de.po                                 | 1795 -----------------------
 help/de/figures/gpk-added-deps.png            |  Bin 55634 -> 0 bytes
 help/de/figures/gpk-application-groups.png    |  Bin 131388 -> 0 bytes
 help/de/figures/gpk-client-codecs.png         |  Bin 18320 -> 0 bytes
 help/de/figures/gpk-log.png                   |  Bin 48250 -> 0 bytes
 help/de/figures/gpk-prefs.png                 |  Bin 27063 -> 0 bytes
 help/de/figures/gpk-remove-confirm.png        |  Bin 55619 -> 0 bytes
 help/de/figures/gpk-repo-auth.png             |  Bin 28717 -> 0 bytes
 help/de/figures/gpk-repo.png                  |  Bin 29818 -> 0 bytes
 help/de/figures/gpk-service-pack.png          |  Bin 28251 -> 0 bytes
 help/de/figures/gpk-signature.png             |  Bin 35348 -> 0 bytes
 help/de/figures/gpk-updates-overview.png      |  Bin 93608 -> 0 bytes
 help/de/figures/gpk-updates-warning.png       |  Bin 20283 -> 0 bytes
 help/de/figures/gpk-updates.png               |  Bin 99597 -> 0 bytes
 help/el/.gitignore                            |    4 -
 help/el/el.po                                 | 1887 -------------------------
 help/es/.gitignore                            |    4 -
 help/es/es.po                                 | 1870 ------------------------
 help/es/figures/gpk-added-deps.png            |  Bin 57084 -> 0 bytes
 help/es/figures/gpk-application-groups.png    |  Bin 118235 -> 0 bytes
 help/es/figures/gpk-client-codecs.png         |  Bin 12863 -> 0 bytes
 help/es/figures/gpk-log.png                   |  Bin 31059 -> 0 bytes
 help/es/figures/gpk-prefs.png                 |  Bin 31292 -> 0 bytes
 help/es/figures/gpk-remove-confirm.png        |  Bin 69362 -> 0 bytes
 help/es/figures/gpk-repo-auth.png             |  Bin 29552 -> 0 bytes
 help/es/figures/gpk-repo.png                  |  Bin 57849 -> 0 bytes
 help/es/figures/gpk-service-pack.png          |  Bin 19658 -> 0 bytes
 help/es/figures/gpk-updates-overview.png      |  Bin 23576 -> 0 bytes
 help/es/figures/gpk-updates-warning.png       |  Bin 42679 -> 0 bytes
 help/es/figures/gpk-updates.png               |  Bin 38013 -> 0 bytes
 help/fr/figures/gpk-added-deps.png            |  Bin 64433 -> 0 bytes
 help/fr/figures/gpk-application-groups.png    |  Bin 132530 -> 0 bytes
 help/fr/figures/gpk-client-codecs.png         |  Bin 26492 -> 0 bytes
 help/fr/figures/gpk-log.png                   |  Bin 50481 -> 0 bytes
 help/fr/figures/gpk-prefs.png                 |  Bin 28701 -> 0 bytes
 help/fr/figures/gpk-repo-auth.png             |  Bin 27551 -> 0 bytes
 help/fr/figures/gpk-repo.png                  |  Bin 28727 -> 0 bytes
 help/fr/figures/gpk-service-pack.png          |  Bin 33541 -> 0 bytes
 help/fr/figures/gpk-signature.png             |  Bin 32269 -> 0 bytes
 help/fr/figures/gpk-updates-overview.png      |  Bin 94671 -> 0 bytes
 help/fr/figures/gpk-updates-warning.png       |  Bin 34885 -> 0 bytes
 help/fr/figures/gpk-updates.png               |  Bin 94109 -> 0 bytes
 help/fr/fr.po                                 | 1867 ------------------------
 help/gl/gl.po                                 | 1762 -----------------------
 help/gnome-packagekit.omf.in                  |   38 -
 help/oc/.gitignore                            |    4 -
 help/oc/oc.po                                 |  145 --
 help/pa/pa.po                                 | 1268 -----------------
 help/pl/.gitignore                            |    4 -
 help/pl/pl.po                                 | 1768 -----------------------
 help/pt_BR/figures/gpk-added-deps.png         |  Bin 59625 -> 0 bytes
 help/pt_BR/figures/gpk-application-groups.png |  Bin 99473 -> 0 bytes
 help/pt_BR/figures/gpk-log.png                |  Bin 46771 -> 0 bytes
 help/pt_BR/figures/gpk-prefs.png              |  Bin 24538 -> 0 bytes
 help/pt_BR/figures/gpk-repo.png               |  Bin 56697 -> 0 bytes
 help/pt_BR/figures/gpk-updates-overview.png   |  Bin 82062 -> 0 bytes
 help/pt_BR/figures/gpk-updates.png            |  Bin 91494 -> 0 bytes
 help/pt_BR/pt_BR.po                           | 1560 --------------------
 help/ru/ru.po                                 | 1659 ----------------------
 help/sl/sl.po                                 |  837 -----------
 help/sv/.gitignore                            |    4 -
 help/sv/sv.po                                 |  142 --
 help/zh_CN/.gitignore                         |    4 -
 help/zh_CN/zh_CN.po                           | 1437 -------------------
 src/gpk-application.c                         |   16 -
 src/gpk-dbus-task.c                           |   17 -
 src/gpk-gnome.c                               |   33 -
 src/gpk-gnome.h                               |    1 -
 src/gpk-helper-chooser.c                      |   12 -
 src/gpk-helper-run.c                          |   12 -
 src/gpk-log.c                                 |   11 -
 src/gpk-modal-dialog.c                        |   39 -
 src/gpk-modal-dialog.h                        |    3 -
 src/gpk-prefs.c                               |   12 -
 src/gpk-task.c                                |   14 -
 105 files changed, 1 insertions(+), 19353 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5bcfed1..fef4cde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,7 @@ SUBDIRS =                                               \
        man                                             \
        src                                             \
        po                                              \
-       data                                            \
-       help
+       data
 
 ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
 
diff --git a/configure.ac b/configure.ac
index 8ebdb1a..57aca39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,6 @@ AM_PROG_CC_C_O
 IT_PROG_INTLTOOL([0.35.0])
 
 GNOME_COMPILE_WARNINGS
-YELP_HELP_INIT
 
 # set up gtk-doc
 GTK_DOC_CHECK(1.9)
@@ -178,18 +177,6 @@ AC_SUBST(BINDIR, $bindir)
 AC_SUBST(SBINDIR, $sbindir)
 
 dnl ---------------------------------------------------------------------------
-dnl - Where should we put documentation ?
-dnl ---------------------------------------------------------------------------
-AC_ARG_WITH(doc-dir,
-              [AS_HELP_STRING([--with-doc-dir=<dir>],[directory to install documentation])])
-if ! test -z "$with_doc_dir"; then
-       DOCDIR="$with_doc_dir/gnome-packagekit-$VERSION"
-else
-       DOCDIR="$DATADIR/doc/gnome-packagekit-$VERSION"
-fi
-AC_SUBST(DOCDIR)
-
-dnl ---------------------------------------------------------------------------
 dnl - Is docbook2man available?
 dnl ---------------------------------------------------------------------------
 AC_PATH_PROG(DOCBOOK2MAN, docbook2man, no)
@@ -214,7 +201,6 @@ dnl ---------------------------------------------------------------------------
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
-help/Makefile
 man/Makefile
 po/Makefile.in
 data/Makefile
diff --git a/data/gpk-application.ui b/data/gpk-application.ui
index 24347cd..b154131 100644
--- a/data/gpk-application.ui
+++ b/data/gpk-application.ui
@@ -606,10 +606,6 @@
     </section>
     <section>
       <item>
-        <attribute name="label" translatable="yes">Help</attribute>
-        <attribute name="action">app.help</attribute>
-      </item>
-      <item>
         <attribute name="label" translatable="yes">About</attribute>
         <attribute name="action">app.about</attribute>
       </item>
diff --git a/data/gpk-client.ui b/data/gpk-client.ui
index 284e87b..21adf28 100644
--- a/data/gpk-client.ui
+++ b/data/gpk-client.ui
@@ -169,22 +169,6 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button_help">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkButton" id="button_cancel">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
@@ -235,7 +219,6 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">button_help</action-widget>
       <action-widget response="0">button_cancel</action-widget>
       <action-widget response="0">button_close</action-widget>
       <action-widget response="0">button_action</action-widget>
diff --git a/data/gpk-eula.ui b/data/gpk-eula.ui
index 7767aea..b7e890c 100644
--- a/data/gpk-eula.ui
+++ b/data/gpk-eula.ui
@@ -119,21 +119,6 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button_help">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkButton" id="button_cancel">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
@@ -174,7 +159,6 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">button_help</action-widget>
       <action-widget response="0">button_cancel</action-widget>
       <action-widget response="0">button_agree</action-widget>
     </action-widgets>
diff --git a/data/gpk-log.ui b/data/gpk-log.ui
index c975818..637f517 100644
--- a/data/gpk-log.ui
+++ b/data/gpk-log.ui
@@ -20,22 +20,6 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button_help">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkButton" id="button_refresh">
                 <property name="label">gtk-refresh</property>
                 <property name="visible">True</property>
@@ -148,7 +132,6 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">button_help</action-widget>
       <action-widget response="0">button_refresh</action-widget>
       <action-widget response="0">button_close</action-widget>
     </action-widgets>
diff --git a/data/gpk-prefs.ui b/data/gpk-prefs.ui
index 00e6176..dc02456 100644
--- a/data/gpk-prefs.ui
+++ b/data/gpk-prefs.ui
@@ -20,23 +20,6 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button_help">
-                <property name="label">gtk-help</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkButton" id="button_close">
                 <property name="label">gtk-close</property>
                 <property name="use_action_appearance">False</property>
@@ -175,7 +158,6 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">button_help</action-widget>
       <action-widget response="0">button_close</action-widget>
     </action-widgets>
   </object>
diff --git a/data/gpk-signature.ui b/data/gpk-signature.ui
index bd10831..e48bd72 100644
--- a/data/gpk-signature.ui
+++ b/data/gpk-signature.ui
@@ -220,22 +220,6 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button_help">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkButton" id="button_no">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
@@ -277,7 +261,6 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">button_help</action-widget>
       <action-widget response="0">button_no</action-widget>
       <action-widget response="0">button_yes</action-widget>
     </action-widgets>
diff --git a/src/gpk-application.c b/src/gpk-application.c
index 24d4a00..6afe308 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -2517,17 +2517,6 @@ gpk_application_entry_text_icon_press_cb (GtkEntry *entry, GtkEntryIconPosition
 }
 
 /**
- * gpk_application_activate_help_cb:
- **/
-static void
-gpk_application_activate_help_cb (GSimpleAction *action,
-                                 GVariant *parameter,
-                                 gpointer user_data)
-{
-       gpk_gnome_help ("add-remove");
-}
-
-/**
  * gpk_application_activate_about_cb:
  **/
 static void
@@ -2540,9 +2529,6 @@ gpk_application_activate_about_cb (GSimpleAction *action,
        const char *authors[] = {
                "Richard Hughes <richard hughsie com>",
                NULL};
-       const char *documenters[] = {
-               "Richard Hughes <richard hughsie com>",
-               NULL};
        const char *artists[] = {
                "Richard Hughes <richard hughsie com>",
                NULL};
@@ -2588,7 +2574,6 @@ gpk_application_activate_about_cb (GSimpleAction *action,
                                /* TRANSLATORS: description of NULL, gpk-application that is */
                               "comments", _("Package Manager for GNOME"),
                               "authors", authors,
-                              "documenters", documenters,
                               "artists", artists,
                               "translator-credits", translators,
                               "logo-icon-name", GPK_ICON_SOFTWARE_INSTALLER,
@@ -3472,7 +3457,6 @@ static GActionEntry gpk_menu_app_entries[] = {
        { "refresh",            gpk_application_activate_refresh_cb, NULL, NULL, NULL },
        { "log",                gpk_application_activate_log_cb, NULL, NULL, NULL },
        { "quit",               gpk_application_activate_quit_cb, NULL, NULL, NULL },
-       { "help",               gpk_application_activate_help_cb, NULL, NULL, NULL },
        { "about",              gpk_application_activate_about_cb, NULL, NULL, NULL },
 };
 
diff --git a/src/gpk-dbus-task.c b/src/gpk-dbus-task.c
index 18b597a..577149d 100644
--- a/src/gpk-dbus-task.c
+++ b/src/gpk-dbus-task.c
@@ -526,7 +526,6 @@ gpk_dbus_task_set_status (GpkDbusTask *dtask, PkStatusEnum status)
                    status == PK_STATUS_ENUM_DOWNLOAD_UPDATEINFO ||
                    status == PK_STATUS_ENUM_REFRESH_CACHE) {
                        gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_PROGRESS, 0);
-                       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-progress");
                        gpk_modal_dialog_present_with_time (dtask->priv->dialog, 0);
                }
        }
@@ -695,7 +694,6 @@ gpk_dbus_task_install_package_files_verify (GpkDbusTask *dtask, GPtrArray *array
        gpk_modal_dialog_set_message (dtask->priv->dialog, message);
        /* TRANSLATORS: title: installing local files */
        gpk_modal_dialog_set_action (dtask->priv->dialog, _("Install"));
-       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-install-files");
        gpk_modal_dialog_present_with_time (dtask->priv->dialog, dtask->priv->timestamp);
        button = gpk_modal_dialog_run (dtask->priv->dialog);
        g_free (message);
@@ -735,7 +733,6 @@ gpk_dbus_task_confirm_action (GpkDbusTask *dtask, const gchar *title, const gcha
 
        gpk_modal_dialog_set_title (dtask->priv->dialog, title);
        gpk_modal_dialog_set_message (dtask->priv->dialog, message);
-       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-application-confirm");
        gpk_modal_dialog_present_with_time (dtask->priv->dialog, dtask->priv->timestamp);
        button = gpk_modal_dialog_run (dtask->priv->dialog);
 
@@ -1087,7 +1084,6 @@ gpk_dbus_task_install_package_names_resolve_cb (PkTask *task, GAsyncResult *res,
                        gpk_modal_dialog_set_title (dtask->priv->dialog, title);
                        /* TRANSLATORS: message: could not find */
                        gpk_modal_dialog_set_message (dtask->priv->dialog, _("The packages could not be found 
in any package source"));
-                       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-package-not-found");
                        /* TRANSLATORS: button: a link to the help file */
                        gpk_modal_dialog_set_action (dtask->priv->dialog, _("More information"));
                        gpk_modal_dialog_present (dtask->priv->dialog);
@@ -1257,7 +1253,6 @@ skip_checks:
        /* TRANSLATORS: title, searching */
        gpk_modal_dialog_set_title (dtask->priv->dialog, _("Searching for packages"));
        gpk_modal_dialog_set_image_status (dtask->priv->dialog, PK_STATUS_ENUM_WAIT);
-       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-finding-packages");
        if (dtask->priv->show_progress)
                gpk_modal_dialog_present (dtask->priv->dialog);
 
@@ -1328,7 +1323,6 @@ gpk_dbus_task_install_provide_files_search_file_cb (PkClient *client, GAsyncResu
                        gpk_modal_dialog_set_title (dtask->priv->dialog, _("Failed to find package"));
                        /* TRANSLATORS: nothing found */
                        gpk_modal_dialog_set_message (dtask->priv->dialog, _("The file could not be found in 
any packages"));
-                       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-package-not-found");
                        /* TRANSLATORS: button: show the user a button to get more help finding stuff */
                        gpk_modal_dialog_set_action (dtask->priv->dialog, _("More information"));
                        gpk_modal_dialog_present (dtask->priv->dialog);
@@ -1633,7 +1627,6 @@ gpk_dbus_task_codec_what_provides_cb (PkClient *client, GAsyncResult *res, GpkDb
                        gpk_modal_dialog_set_title (dtask->priv->dialog, _("Failed to search for plugin"));
                        /* TRANSLATORS: no package sources have the wanted codec */
                        gpk_modal_dialog_set_message (dtask->priv->dialog, _("Could not find plugin in any 
configured package source"));
-                       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-package-not-found");
 
                        /* TRANSLATORS: button text */
                        gpk_modal_dialog_set_action (dtask->priv->dialog, _("More information"));
@@ -1750,7 +1743,6 @@ skip_checks:
        /* TRANSLATORS: search for codec */
        gpk_modal_dialog_set_title (dtask->priv->dialog, _("Searching for plugins"));
        gpk_modal_dialog_set_image_status (dtask->priv->dialog, PK_STATUS_ENUM_WAIT);
-       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-finding-packages");
 
        /* setup the UI */
        if (dtask->priv->show_progress)
@@ -1844,7 +1836,6 @@ gpk_dbus_task_mime_what_provides_cb (PkClient *client, GAsyncResult *res, GpkDbu
                        gpk_modal_dialog_set_title (dtask->priv->dialog, _("Failed to find software"));
                        /* TRANSLATORS: nothing found in the package sources that helps */
                        gpk_modal_dialog_set_message (dtask->priv->dialog, _("No new applications can be 
found to handle this type of file"));
-                       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-package-not-found");
                        /* TRANSLATORS: button: show the user a button to get more help finding stuff */
                        gpk_modal_dialog_set_action (dtask->priv->dialog, _("More information"));
                        gpk_modal_dialog_present (dtask->priv->dialog);
@@ -1945,7 +1936,6 @@ skip_checks:
        /* TRANSLATORS: title: searching for mime type handlers */
        gpk_modal_dialog_set_title (dtask->priv->dialog, _("Searching for file handlers"));
        gpk_modal_dialog_set_image_status (dtask->priv->dialog, PK_STATUS_ENUM_WAIT);
-       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-finding-packages");
 
        /* setup the UI */
        if (dtask->priv->show_progress)
@@ -2103,7 +2093,6 @@ gpk_dbus_task_fontconfig_what_provides_cb (PkClient *client, GAsyncResult *res,
                        gpk_modal_dialog_set_title (dtask->priv->dialog, title);
                        /* TRANSLATORS: message: tell the user we suck */
                        gpk_modal_dialog_set_message (dtask->priv->dialog, _("No new fonts can be found for 
this document"));
-                       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-package-not-found");
                        /* TRANSLATORS: button: show the user a button to get more help finding stuff */
                        gpk_modal_dialog_set_action (dtask->priv->dialog, _("More information"));
                        gpk_modal_dialog_present (dtask->priv->dialog);
@@ -2325,7 +2314,6 @@ skip_checks:
        gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_PROGRESS, 0);
        gpk_modal_dialog_set_title (dtask->priv->dialog, title);
        gpk_modal_dialog_set_image_status (dtask->priv->dialog, PK_STATUS_ENUM_WAIT);
-       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-finding-packages");
 
        /* setup the UI */
        if (dtask->priv->show_progress)
@@ -2443,7 +2431,6 @@ gpk_dbus_task_plasma_service_what_provides_cb (PkClient *client, GAsyncResult *r
                        gpk_modal_dialog_set_title (dtask->priv->dialog, _("Failed to search for Plasma 
service"));
                        /* TRANSLATORS: no package sources have the wanted Plasma service */
                        gpk_modal_dialog_set_message (dtask->priv->dialog, _("Could not find service in any 
configured package source"));
-                       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-package-not-found");
 
                        /* TRANSLATORS: button text */
                        gpk_modal_dialog_set_action (dtask->priv->dialog, _("More information"));
@@ -2550,7 +2537,6 @@ skip_checks:
        /* TRANSLATORS: search for Plasma services */
        gpk_modal_dialog_set_title (dtask->priv->dialog, _("Searching for services"));
        gpk_modal_dialog_set_image_status (dtask->priv->dialog, PK_STATUS_ENUM_WAIT);
-       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-finding-packages");
 
        /* setup the UI */
        if (dtask->priv->show_progress)
@@ -2772,8 +2758,6 @@ gpk_dbus_task_install_printer_drivers (GpkDbusTask *dtask, gchar **device_ids, G
                                    _("Searching for packages"));
        gpk_modal_dialog_set_image_status (dtask->priv->dialog,
                                           PK_STATUS_ENUM_WAIT);
-       gpk_modal_dialog_set_help_id (dtask->priv->dialog,
-                                     "dialog-finding-packages");
 
        /* setup the UI */
        if (dtask->priv->show_progress)
@@ -2912,7 +2896,6 @@ gpk_dbus_task_remove_package_by_file_search_file_cb (PkClient *client, GAsyncRes
                        gpk_modal_dialog_set_title (dtask->priv->dialog, _("Failed to find package for this 
file"));
                        /* TRANSLATORS: nothing found */
                        gpk_modal_dialog_set_message (dtask->priv->dialog, _("The file could not be found in 
any packages"));
-                       gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-package-not-found");
                        /* TRANSLATORS: button: show the user a button to get more help finding stuff */
                        gpk_modal_dialog_present (dtask->priv->dialog);
                        gpk_modal_dialog_run (dtask->priv->dialog);
diff --git a/src/gpk-gnome.c b/src/gpk-gnome.c
index 4c0e875..64be572 100644
--- a/src/gpk-gnome.c
+++ b/src/gpk-gnome.c
@@ -47,36 +47,3 @@ gpk_gnome_open (const gchar *url)
        }
        return ret;
 }
-
-/**
- * gpk_gnome_help:
- * @link_id: Subsection of gnome-packagekit help file, or %NULL.
- **/
-gboolean
-gpk_gnome_help (const gchar *link_id)
-{
-       GError *error = NULL;
-       gchar *uri;
-       gboolean ret = TRUE;
-
-       if (link_id)
-               uri = g_strconcat ("help:gnome-packagekit/", link_id, NULL);
-       else
-               uri = g_strdup ("help:gnome-packagekit");
-       g_debug ("opening uri %s", uri);
-
-       gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error);
-
-       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, "%s", error->message);
-               gtk_dialog_run (GTK_DIALOG(d));
-               gtk_widget_destroy (d);
-               g_error_free (error);
-               ret = FALSE;
-       }
-
-       g_free (uri);
-       return ret;
-}
diff --git a/src/gpk-gnome.h b/src/gpk-gnome.h
index ed34752..a381965 100644
--- a/src/gpk-gnome.h
+++ b/src/gpk-gnome.h
@@ -27,7 +27,6 @@
 G_BEGIN_DECLS
 
 gboolean        gpk_gnome_open                         (const gchar    *url);
-gboolean        gpk_gnome_help                         (const gchar    *link_id);
 
 G_END_DECLS
 
diff --git a/src/gpk-helper-chooser.c b/src/gpk-helper-chooser.c
index 0960c30..0f80038 100644
--- a/src/gpk-helper-chooser.c
+++ b/src/gpk-helper-chooser.c
@@ -94,16 +94,6 @@ gpk_helper_chooser_button_response_cb (GtkDialog *dialog, GtkResponseType respon
 }
 
 /**
- * gpk_helper_chooser_button_help_cb:
- **/
-static void
-gpk_helper_chooser_button_help_cb (GtkWidget *widget, GpkHelperChooser *helper)
-{
-       /* show the help */
-       gpk_gnome_help ("mime-types");
-}
-
-/**
  * gpk_helper_chooser_treeview_clicked_cb:
  **/
 static void
@@ -289,8 +279,6 @@ gpk_helper_chooser_init (GpkHelperChooser *helper)
        gpk_window_set_size_request (GTK_WINDOW (widget), 600, 300);
 
        /* connect up buttons */
-       widget = GTK_WIDGET (gtk_builder_get_object (helper->priv->builder, "button_help"));
-       g_signal_connect (widget, "clicked", G_CALLBACK (gpk_helper_chooser_button_help_cb), helper);
        widget = GTK_WIDGET (gtk_builder_get_object (helper->priv->builder, "button_close"));
        g_signal_connect (widget, "clicked", G_CALLBACK (gpk_helper_chooser_button_cancel_cb), helper);
 
diff --git a/src/gpk-helper-run.c b/src/gpk-helper-run.c
index ed274e6..3d998b7 100644
--- a/src/gpk-helper-run.c
+++ b/src/gpk-helper-run.c
@@ -119,16 +119,6 @@ gpk_helper_run_button_close_cb (GtkWidget *widget, GpkHelperRun *helper)
 }
 
 /**
- * gpk_helper_run_button_help_cb:
- **/
-static void
-gpk_helper_run_button_help_cb (GtkWidget *widget, GpkHelperRun *helper)
-{
-       /* show the help */
-       gpk_gnome_help ("run");
-}
-
-/**
  * gpk_helper_run_delete_event_cb:
  **/
 static gboolean
@@ -462,8 +452,6 @@ gpk_helper_run_init (GpkHelperRun *helper)
        /* connect up buttons */
        widget = GTK_WIDGET (gtk_builder_get_object (helper->priv->builder, "button_close"));
        g_signal_connect (widget, "clicked", G_CALLBACK (gpk_helper_run_button_close_cb), helper);
-       widget = GTK_WIDGET (gtk_builder_get_object (helper->priv->builder, "button_help"));
-       g_signal_connect (widget, "clicked", G_CALLBACK (gpk_helper_run_button_help_cb), helper);
 
        /* hide the filter box */
        widget = GTK_WIDGET (gtk_builder_get_object (helper->priv->builder, "hbox_filter"));
diff --git a/src/gpk-log.c b/src/gpk-log.c
index ea9ab29..6b6bf38 100644
--- a/src/gpk-log.c
+++ b/src/gpk-log.c
@@ -142,15 +142,6 @@ gpk_log_model_get_iter (GtkTreeModel *model, GtkTreeIter *iter, const gchar *id)
 }
 
 /**
- * gpk_log_button_help_cb:
- **/
-static void
-gpk_log_button_help_cb (GtkWidget *widget, gpointer data)
-{
-       gpk_gnome_help ("software-log");
-}
-
-/**
  * gpk_log_get_localised_date:
  **/
 static gchar *
@@ -724,8 +715,6 @@ gpk_log_startup_cb (GtkApplication *application, gpointer user_data)
                          G_CALLBACK (gpk_log_button_close_cb), application);
        gtk_widget_grab_default (widget);
 
-       widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_help"));
-       g_signal_connect (widget, "clicked", G_CALLBACK (gpk_log_button_help_cb), NULL);
        widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_refresh"));
        g_signal_connect (widget, "clicked", G_CALLBACK (gpk_log_button_refresh_cb), NULL);
        gtk_widget_hide (widget);
diff --git a/src/gpk-modal-dialog.c b/src/gpk-modal-dialog.c
index c43a514..c96eff7 100644
--- a/src/gpk-modal-dialog.c
+++ b/src/gpk-modal-dialog.c
@@ -58,7 +58,6 @@ struct _GpkModalDialogPrivate
        GMainLoop               *loop;
        GtkResponseType          response;
        GtkListStore            *store;
-       gchar                   *help_id;
        gchar                   *title;
        gboolean                 set_image;
        GpkModalDialogPage       page;
@@ -70,7 +69,6 @@ enum {
        GPK_MODAL_DIALOG_CLOSE,
        GPK_MODAL_DIALOG_QUIT,
        GPK_MODAL_DIALOG_ACTION,
-       GPK_MODAL_DIALOG_HELP,
        GPK_MODAL_DIALOG_CANCEL,
        LAST_SIGNAL
 };
@@ -109,8 +107,6 @@ gpk_modal_dialog_setup (GpkModalDialog *dialog, GpkModalDialogPage page, PkBitfi
        g_return_val_if_fail (GPK_IS_CLIENT_DIALOG (dialog), FALSE);
 
        /* reset state */
-       g_free (dialog->priv->help_id);
-       dialog->priv->help_id = NULL;
        dialog->priv->set_image = FALSE;
        dialog->priv->page = page;
        dialog->priv->options = options;
@@ -154,7 +150,6 @@ gpk_modal_dialog_present_with_time (GpkModalDialog *dialog, guint32 timestamp)
                        gpk_modal_dialog_set_image (dialog, "dialog-question");
                bitfield = pk_bitfield_from_enums (GPK_MODAL_DIALOG_WIDGET_BUTTON_CLOSE,
                                                   GPK_MODAL_DIALOG_WIDGET_BUTTON_ACTION,
-                                                  GPK_MODAL_DIALOG_WIDGET_BUTTON_HELP,
                                                   GPK_MODAL_DIALOG_WIDGET_MESSAGE,
                                                   -1);
        } else if (dialog->priv->page == GPK_MODAL_DIALOG_PAGE_WARNING) {
@@ -175,7 +170,6 @@ gpk_modal_dialog_present_with_time (GpkModalDialog *dialog, guint32 timestamp)
        /* we can specify extras */
        bitfield += dialog->priv->options;
 
-       gpk_modal_dialog_show_widget (dialog, "button_help", pk_bitfield_contain (bitfield, 
GPK_MODAL_DIALOG_WIDGET_BUTTON_HELP));
        gpk_modal_dialog_show_widget (dialog, "button_cancel", pk_bitfield_contain (bitfield, 
GPK_MODAL_DIALOG_WIDGET_BUTTON_CANCEL));
        gpk_modal_dialog_show_widget (dialog, "button_close", pk_bitfield_contain (bitfield, 
GPK_MODAL_DIALOG_WIDGET_BUTTON_CLOSE));
        gpk_modal_dialog_show_widget (dialog, "button_action", pk_bitfield_contain (bitfield, 
GPK_MODAL_DIALOG_WIDGET_BUTTON_ACTION));
@@ -584,28 +578,6 @@ gpk_modal_dialog_button_close_cb (GtkWidget *widget_button, GpkModalDialog *dial
 }
 
 /**
- * gpk_modal_dialog_set_help_id:
- **/
-gboolean
-gpk_modal_dialog_set_help_id (GpkModalDialog *dialog, const gchar *help_id)
-{
-       g_return_val_if_fail (GPK_IS_CLIENT_DIALOG (dialog), FALSE);
-       g_return_val_if_fail (dialog->priv->help_id == NULL, FALSE);
-       dialog->priv->help_id = g_strdup (help_id);
-       return TRUE;
-}
-
-/**
- * gpk_modal_dialog_button_help_cb:
- **/
-static void
-gpk_modal_dialog_button_help_cb (GtkWidget *widget_button, GpkModalDialog *dialog)
-{
-       gpk_gnome_help (dialog->priv->help_id);
-       g_signal_emit (dialog, signals [GPK_MODAL_DIALOG_HELP], 0);
-}
-
-/**
  * gpk_modal_dialog_button_action_cb:
  **/
 static void
@@ -780,13 +752,6 @@ gpk_modal_dialog_class_init (GpkModalDialogClass *klass)
                              0, NULL, NULL,
                              g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
-       signals [GPK_MODAL_DIALOG_HELP] =
-               g_signal_new ("help",
-                             G_TYPE_FROM_CLASS (object_class),
-                             G_SIGNAL_RUN_LAST,
-                             0, NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID,
-                             G_TYPE_NONE, 0);
 }
 
 /**
@@ -812,7 +777,6 @@ gpk_modal_dialog_init (GpkModalDialog *dialog)
        dialog->priv->set_image = FALSE;
        dialog->priv->page = GPK_MODAL_DIALOG_PAGE_UNKNOWN;
        dialog->priv->options = 0;
-       dialog->priv->help_id = NULL;
        dialog->priv->title = NULL;
 
        dialog->priv->store = gtk_list_store_new (GPK_MODAL_DIALOG_STORE_LAST,
@@ -843,8 +807,6 @@ gpk_modal_dialog_init (GpkModalDialog *dialog)
        g_signal_connect (widget, "delete_event", G_CALLBACK (gpk_modal_dialog_window_delete_cb), dialog);
        widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->builder, "button_close"));
        g_signal_connect (widget, "clicked", G_CALLBACK (gpk_modal_dialog_button_close_cb), dialog);
-       widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->builder, "button_help"));
-       g_signal_connect (widget, "clicked", G_CALLBACK (gpk_modal_dialog_button_help_cb), dialog);
        widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->builder, "button_action"));
        g_signal_connect (widget, "clicked", G_CALLBACK (gpk_modal_dialog_button_action_cb), dialog);
        widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->builder, "button_cancel"));
@@ -890,7 +852,6 @@ gpk_modal_dialog_finalize (GObject *object)
        g_object_unref (dialog->priv->store);
        g_object_unref (dialog->priv->builder);
        g_main_loop_unref (dialog->priv->loop);
-       g_free (dialog->priv->help_id);
        g_free (dialog->priv->title);
 
        G_OBJECT_CLASS (gpk_modal_dialog_parent_class)->finalize (object);
diff --git a/src/gpk-modal-dialog.h b/src/gpk-modal-dialog.h
index 51d233d..f626764 100644
--- a/src/gpk-modal-dialog.h
+++ b/src/gpk-modal-dialog.h
@@ -55,7 +55,6 @@ typedef enum
  */
 typedef enum
 {
-       GPK_MODAL_DIALOG_WIDGET_BUTTON_HELP,
        GPK_MODAL_DIALOG_WIDGET_BUTTON_CANCEL,
        GPK_MODAL_DIALOG_WIDGET_BUTTON_CLOSE,
        GPK_MODAL_DIALOG_WIDGET_BUTTON_ACTION,
@@ -115,8 +114,6 @@ gboolean     gpk_modal_dialog_set_image_status      (GpkModalDialog         *dialog,
                                                         PkStatusEnum            status);
 gboolean        gpk_modal_dialog_set_allow_cancel      (GpkModalDialog         *dialog,
                                                         gboolean                can_cancel);
-gboolean        gpk_modal_dialog_set_help_id           (GpkModalDialog         *dialog,
-                                                        const gchar            *help_id);
 GtkWindow      *gpk_modal_dialog_get_window            (GpkModalDialog         *dialog);
 GtkResponseType         gpk_modal_dialog_run                   (GpkModalDialog         *dialog);
 gboolean        gpk_modal_dialog_close                 (GpkModalDialog         *dialog);
diff --git a/src/gpk-prefs.c b/src/gpk-prefs.c
index 1189967..39531bf 100644
--- a/src/gpk-prefs.c
+++ b/src/gpk-prefs.c
@@ -58,15 +58,6 @@ enum {
 };
 
 /**
- * gpk_prefs_help_cb:
- **/
-static void
-gpk_prefs_help_cb (GtkWidget *widget, GpkPrefsPrivate *priv)
-{
-       gpk_gnome_help ("prefs");
-}
-
-/**
  * gpk_prefs_find_iter_model_cb:
  **/
 static gboolean
@@ -567,9 +558,6 @@ gpk_pack_startup_cb (GtkApplication *application, GpkPrefsPrivate *priv)
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_close"));
        g_signal_connect (widget, "clicked",
                          G_CALLBACK (gpk_prefs_close_cb), priv);
-       widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_help"));
-       g_signal_connect (widget, "clicked",
-                         G_CALLBACK (gpk_prefs_help_cb), priv);
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "checkbutton_detail"));
        g_settings_bind (priv->settings_gpk,
diff --git a/src/gpk-task.c b/src/gpk-task.c
index ced44a5..791598e 100644
--- a/src/gpk-task.c
+++ b/src/gpk-task.c
@@ -105,16 +105,6 @@ gpk_task_dialog_response_cb (GtkDialog *dialog, gint response_id, GpkTask *task)
 }
 
 /**
- * gpk_task_button_help_cb:
- **/
-static void
-gpk_task_button_help_cb (GtkWidget *widget, GpkTask *task)
-{
-       /* show the help */
-       gpk_gnome_help (task->priv->help_id);
-}
-
-/**
  * gpk_task_untrusted_question:
  **/
 static void
@@ -652,8 +642,6 @@ gpk_task_setup_dialog_signature (GpkTask *task)
        /* connect up buttons */
        widget = GTK_WIDGET (gtk_builder_get_object (task->priv->builder_signature, "button_yes"));
        g_signal_connect (widget, "clicked", G_CALLBACK (gpk_task_button_accept_cb), task);
-       widget = GTK_WIDGET (gtk_builder_get_object (task->priv->builder_signature, "button_help"));
-       g_signal_connect (widget, "clicked", G_CALLBACK (gpk_task_button_help_cb), task);
        widget = GTK_WIDGET (gtk_builder_get_object (task->priv->builder_signature, "button_no"));
        g_signal_connect (widget, "clicked", G_CALLBACK (gpk_task_button_decline_cb), task);
 }
@@ -687,8 +675,6 @@ gpk_task_setup_dialog_eula (GpkTask *task)
        /* connect up buttons */
        widget = GTK_WIDGET (gtk_builder_get_object (task->priv->builder_eula, "button_agree"));
        g_signal_connect (widget, "clicked", G_CALLBACK (gpk_task_button_accept_cb), task);
-       widget = GTK_WIDGET (gtk_builder_get_object (task->priv->builder_eula, "button_help"));
-       g_signal_connect (widget, "clicked", G_CALLBACK (gpk_task_button_help_cb), task);
        widget = GTK_WIDGET (gtk_builder_get_object (task->priv->builder_eula, "button_cancel"));
        g_signal_connect (widget, "clicked", G_CALLBACK (gpk_task_button_decline_cb), task);
 }



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