Changeset 2348

Timestamp:

06/06/07 05:19:13 (2 years ago)

Author:

isak

Message:

Merged the fix-root-uninstall branch to trunk. This means the (gtk) manager doesn't spawn itself anymore when uninstalling root owned packages. It now calls 'package remove <foo>' instead and keeps running.

Files:

• frontend/trunk/manager/ChangeLog (modified) (1 diff)
• frontend/trunk/manager/frontend-gtk/Makefile.am (modified) (1 diff)
• frontend/trunk/manager/frontend-gtk/gui_cb.c (copied) (copied from frontend/branches/fix-root-uninstall/manager/frontend-gtk/gui_cb.c)
• frontend/trunk/manager/frontend-gtk/main.c (modified) (16 diffs)
• frontend/trunk/manager/frontend-gtk/manager-gtk.glade (modified) (1 diff)
• frontend/trunk/manager/frontend-gtk/manager-gtk.h (copied) (copied from frontend/branches/fix-root-uninstall/manager/frontend-gtk/manager-gtk.h)

frontend/trunk/manager/ChangeLog

@@ +1 @@
+2007-05-25  Isak Savo  <isak.savo@gmail.com>
+
+        * frontend-gtk/gui_cb.c (show_uninstall_error_message): Ooops.. missing 'break;' in case statement
+
+2007-05-24  Isak Savo  <isak.savo@gmail.com>
+
+        * frontend-gtk/manager-gtk.h: New file! Moved app global declarations here instead of having them at the top of main.c.
+
+        * frontend-gtk/main.c: Removed a bunch of the global variables and made them either function private or attached them to GObjects using g_object_set_data()
+
+        * frontend-gtk/gui_cb.c: New file! Moved all gui callbacks and their helper functions to this file.
+        (remove_clicked_cb): Changed so that we now call 'package remove <shortname>' for root owned packages instead of spawning a new manager as root.
+        This is much more intuitive behavior. Should fix #21 and may also fix #1.
+        (show_uninstall_error_message): Much better error reporting in case something goes wrong when a package is uninstalled.
+
-2007-05-23  Isak Savo  <isak.savo@gmail.com>
-

frontend/trunk/manager/frontend-gtk/Makefile.am

@@ -5 +5 @@
-
-bin_PROGRAMS = autopackage-manager-gtk
-
+ gui_cb.c
-autopackage_manager_gtk_LDFLAGS = `pkg-config --libs gtk+-2.0 libglade-2.0 gmodule-2.0 gthread-2.0`
-autopackage_manager_gtk_LDADD   = $(top_builddir)/managercore/libcore.a -lpthread

frontend/trunk/manager/frontend-gtk/main.c

@@ -24 +24 @@
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <libintl.h>
-
-#include <gtk/gtk.h>
-#include <gmodule.h>
-#include <glade/glade.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
@@ -46 +39 @@
-
-#include "prefix.h"
-
-
-
-
+
+
+
-
-int logging = 0;
-GladeXML *xml;
-GtkListStore *store;
-gchar *selfpath = NULL;
-gchar *prefix = NULL;
-ApplicationInfo *selected;
-
-
-
-
+
-
-/* This determines what apps to show in the list (see frontend-interface.h for details) */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-/* To simplify pointer comparisons */
@@ -110 +63 @@
- *                 If 'str' is null, the empty string ("") is returned!
- *
-(ev. partially) 
+
- *          since this function never returns NULL.
- */
@@ -134 +87 @@
-        {
-                g_free (retval);
-
-
-
+
-                if (bytes_read > 0)
-                        valid_utf8bytes = bytes_read;
@@ -170 +121 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-{
-    if (*error)
@@ -331 +261 @@
-}
-
-
-
+
-{
-        gchar **components, **date, **stime;
@@ -379 +308 @@
-}
-
-static 
+
-{
-        GdkPixbuf *pixbuf = lookup_icon(info->icon);
-        gchar *details, *size, *date;
-        gchar *namestr;
-
+
-        
-        /* FIXME: These should use MiB and KiB instead */
@@ -435 +364 @@
-{
-    ApplicationInfo *info = (ApplicationInfo *) ptr;
+    AutoPackageAppType filter = gtk_option_menu_get_history (GTK_OPTION_MENU (W("appfilter")));
-
-    TRACE("application_found: %p\n", ptr);
@@ -448 +378 @@
-        return FALSE;
-    }
-
-pkg_list = g_list_append (pkg_list, info
+
+g_object_set_data (G_OBJECT(W("packagelist")), "pkglist", g_list_append (pkg_list, info)
-    
-    if (info->type == APP_TYPE_DESKTOP) {
@@ -469 +399 @@
-}
-
-
+
+
-static void application_found_callback(ApplicationInfo *info)
-{
@@ -476 +407 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        return TRUE;
-}
-
-static void enable_disable_gui(gboolean enabled)
-{
-    gtk_widget_set_sensitive(W("packagelist"), enabled);
-    gtk_widget_set_sensitive(W("remove"), enabled);
-    gtk_widget_set_sensitive(W("close"), enabled);
-    gtk_widget_set_sensitive(W("appfilter"), enabled);
-}
-
-static gboolean uninstall_completed_callback(gpointer _errorcode)
-{
-    int errorcode = GPOINTER_TO_INT(_errorcode);
-    TRACE("uninstall completed, errorcode=%d\n", errorcode);
-
-    GtkWidget *view = W("packagelist");
-    if (errorcode == 0)
-    {
-        GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
-        GtkTreeIter iter;
-        GtkTreeModel *model;
-
-        gtk_tree_selection_get_selected(sel, &model, &iter);
-        GdkPixbuf *pixbuf;
-        gtk_tree_model_get(model, &iter, COL_PIXBUF, &pixbuf, -1);
-        if (pixbuf) gdk_pixbuf_unref(pixbuf);
-        gtk_list_store_remove(store, &iter);
-
-        /* remove from internal list */
-        pkg_list = g_list_remove(pkg_list, selected);
-        
-        /* select the first item */
-        GtkTreePath *path = gtk_tree_path_new_from_string("0");
-        gtk_tree_view_set_cursor(GTK_TREE_VIEW(view), path, NULL, FALSE);
-        gtk_tree_path_free(path);
-    }
-
-    gtk_label_set_text(GTK_LABEL(W("status")),
-        (const gchar *) _("Select the application you want to uninstall and click \"Remove\"."));
-    
-    enable_disable_gui(TRUE);
-    gtk_widget_grab_focus(view);
-    gtk_timeout_remove(pulse_progress_id);
-    gtk_widget_hide(W("removing"));
-    gtk_widget_show(W("appfilter"));
-    return FALSE;
-}
-
-
-static void uninstall_completed_callback_marshaller(int errorcode)
-{
-    g_idle_add(uninstall_completed_callback, GINT_TO_POINTER(errorcode));
-}
-
-void remove_clicked(GtkWidget *button, gpointer data)
-{
-    assert( selected );
-    TRACE("remove clicked for %s\n", selected->name);
-
-    GtkLabel *status = GTK_LABEL(W("status"));
-
-    char *text = g_strdup_printf((const gchar *) _("Removing %s..."), selected->name);
-    gtk_label_set_text(status, text);
-
-    enable_disable_gui(FALSE);
-
-    gtk_widget_show(W("removing"));
-    gtk_widget_hide(W("appfilter"));
-    // clearlooks can send us into an infinite loop with this line so hide it instead
-    pulse_progress_id = gtk_timeout_add(20, pulse_progress, W("removing"));
-
-
-    if (selected->root && geteuid() != 0)
-    {
-            TRACE("Need elevated privileges to remove selected package!\n");
-        gpointer gnomesu_spawn_async2;
-        GModule *mod = g_module_open("libgnomesu.so.0", G_MODULE_BIND_LAZY );
-
-        if (mod && g_module_symbol(mod, "gnomesu_spawn_async2", &gnomesu_spawn_async2))
-        {
-                TRACE("Using libgnomesu to spawn '%s'\n", selfpath);
-            /* libgnomesu is available */
-            typedef gboolean (*GnomesuSpawnAsync2) (const gchar *user, const gchar **argv, GPid *pid,
-                                                GdkPixbuf *icon, const gchar *title, gboolean show_command);
-            const gchar *argv[3];
-
-            argv[0] = selfpath;
-            argv[1] = "--rootmode";
-            argv[2] = NULL;
-            gtk_widget_hide(W("window1"));
-            ((GnomesuSpawnAsync2) gnomesu_spawn_async2)(NULL, argv, NULL,
-                NULL, _("Manage 3rd party software"), FALSE);
-            exit(0);
-
-        } else
-        {
-            gchar *autosu = NULL;
-            gchar *home = g_strdup_printf("%s/.local/libexec/autopackage/autosu", g_get_home_dir());
-
-            if (g_file_test("/usr/libexec/autopackage/autosu-gtk", G_FILE_TEST_IS_REGULAR))
-                autosu = g_strdup("/usr/libexec/autopackage/autosu-gtk");
-            else if (g_file_test(home, G_FILE_TEST_IS_REGULAR))
-                autosu = g_strdup(home);
-            g_free (home);
-            TRACE("Using autosu (%s) to spawn '%s'\n", autosu, selfpath);
-            if (!autosu)
-            {
-                    uninstall_completed_callback(GINT_TO_POINTER(-1));
-                    GtkWidget *dlg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                            GTK_MESSAGE_ERROR,
-                                                            GTK_BUTTONS_OK,
-                                                            "Cannot uninstall the selected package because the program used to switch to root (autosu) could not be found\n"
-                                                            "You need to start the 'autopackage-manager-gtk' as root directly to remove this application'");
-                    gtk_dialog_run(GTK_DIALOG(dlg));
-                    gtk_widget_destroy(dlg);
-                    return;
-                                                           
-            }
-            GError *err = NULL;
-            gint child_exitstatus;
-            gchar *argv[7];
-            argv[0] = autosu;
-            argv[1] = "--root-only";
-            argv[2] = "-m";
-            argv[3] = "manage";
-            argv[4] = (gchar *) selfpath;
-            argv[5] = "--rootmode";
-            argv[6] = NULL;
-            if (!g_spawn_sync (NULL, argv, NULL, G_SPAWN_CHILD_INHERITS_STDIN,
-                               NULL, NULL, NULL /* stdout */, NULL /* stderr */, &child_exitstatus, &err))
-            {
-                    uninstall_completed_callback(GINT_TO_POINTER(-2));
-                    GtkWidget *dlg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                            GTK_MESSAGE_ERROR,
-                                                            GTK_BUTTONS_OK,
-                                                            "Cannot uninstall the selected package because the program used to switch "
-                                                            "to root (autosu) could not be launched.\n\n"
-                                                            "The error reported was: %s", err->message);
-                    gtk_dialog_run(GTK_DIALOG(dlg));
-                    g_error_free(err);
-                    gtk_widget_destroy(dlg);
-                    return;
-                    
-            }
-            child_exitstatus = WEXITSTATUS(child_exitstatus);
-            TRACE ("Exitstatus of autosu: %d\n", child_exitstatus);
-            if (child_exitstatus == 0)
-                    exit(0);
-            uninstall_completed_callback(GINT_TO_POINTER(-3));
-        }
-
-    } else
-        uninstallPackage(selected, uninstall_completed_callback_marshaller);
-}
-
-static gboolean post_gui_init(gpointer ptr)
@@ -680 +419 @@
-    TRACE("post gui init\n");
-
-store = gtk_list_store_new
+GtkListStore *store = gtk_list_store_new 
-    
-    GtkCellRenderer *textrenderer = gtk_cell_renderer_text_new();
@@ -687 +426 @@
-    
-    GtkTreeView *view = GTK_TREE_VIEW(W("packagelist"));
-assert( view 
+g_assert (view
-
-
@@ -704 +443 @@
-
-    gtk_tree_view_insert_column_with_attributes(view, -1, _("Icon"),
-            
+                                               
-
-    if (expando)
@@ -728 +467 @@
-    GtkTreeSelection *select = gtk_tree_view_get_selection(view);
-    gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE);
-ackagelist_selection_changed
+kglst_selection_changed_cb
-
-    g_signal_connect(G_OBJECT(W("window1")), "delete_event", G_CALLBACK(gtk_main_quit), NULL);
@@ -816 +555 @@
-    gtk_widget_show(W("searching"));
-    g_idle_add(post_gui_init, NULL);
-
+(GSourceFunc) 
-    gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(W("searching")), 0.01);
-    

frontend/trunk/manager/frontend-gtk/manager-gtk.glade

@@ -191 +191 @@
-              <property name="relief">GTK_RELIEF_NORMAL</property>
-              
-
+_cb
-
-              <child>