← Back to branch summary

~ubuntu-branches/ubuntu/raring/nautilus/raring

« back to all changes in this revision

Viewing changes to .pc/12_unity_launcher_support.patch/src/nautilus-application.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Jeremy Bicha
  • Date: 2012-01-31 13:45:01 UTC
  • mfrom: (1.17.25)
  • Revision ID: package-import@ubuntu.com-20120131134501-yn7mqny7fgzx9fao
Tags: 1:3.3.4-0ubuntu1
https://launchpad.net/bugs/126540
https://launchpad.net/bugs/61786
https://launchpad.net/bugs/503330
https://launchpad.net/bugs/846289
https://launchpad.net/bugs/575719
https://launchpad.net/bugs/230098
* New upstream version which fixes:
  - "Opening Popupmenu in Context of Folder with List-View impossible?"
    (lp: #126540)
  - "'Create folder in here' context menu option for nautilus" (lp: #61786)
  - the file count and the size count change in opposite direction.
    (lp: #503330)
  - the mounts in the place menu should have a properties entry.
    (lp: #846289)
  - add command line option to select file (lp: #575719)
  - Media in 'Places' side bar should have same context menu as in 
    'Computer' (lp: #230098)
* debian/nautilus-data.install:
  - updated, ui and icons have been moved into gresources
* debian/patches/05_desktop_menu_export.patch:
   - updated to correctly include the gresources desktop definition

[ Jeremy Bicha ]
* New upstream release.
* debian/control.in:
  - Bump minimum GTK and glib
* Refreshed patches
* Dropped upstream patches:
  - 17_dont_allow_new_tab_on_desktop.patch
  - 18_fix_crash_in_get_current_uri.patch
  - 19_lazily_initialize_notification_service.patch
  - git_sideplace_sorting.patch
  - git_next_row.patch
  - git_dont_document_browser_option.patch
  - git_browser_compat.patch
  - git_bookmarks_reordering.patch
  - git_listview_context_menus.patch
  - git_use_gtk_grid.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/12_unity_launcher_support.patch/src/nautilus-application.c
36
36
 
37
37
#include "nautilus-desktop-icon-view.h"
38
38
#include "nautilus-desktop-window.h"
 
39
#include "nautilus-freedesktop-dbus.h"
39
40
#include "nautilus-icon-view.h"
40
41
#include "nautilus-image-properties-page.h"
41
42
#include "nautilus-list-view.h"
71
72
#include <glib/gi18n.h>
72
73
#include <gio/gio.h>
73
74
#include <eel/eel-gtk-extensions.h>
74
 
#include <eel/eel-gtk-macros.h>
75
75
#include <eel/eel-stock-dialogs.h>
76
76
#include <libnotify/notify.h>
77
77
#include <gdk/gdkx.h>
666
666
        /* Handle the windows in the close list. */
667
667
        for (node = close_list; node != NULL; node = node->next) {
668
668
                slot = node->data;
669
 
                window = slot->pane->window;
670
669
 
671
670
                if (slot != force_no_close_slot) {
672
671
                        nautilus_window_pane_slot_close (slot->pane, slot);
729
728
        }
730
729
}
731
730
 
 
731
void
 
732
nautilus_application_open_location (NautilusApplication *application,
 
733
                                    GFile *location,
 
734
                                    GFile *selection,
 
735
                                    const char *startup_id)
 
736
{
 
737
        NautilusWindow *window;
 
738
        GList *sel_list = NULL;
 
739
 
 
740
        window = nautilus_application_create_window (application, gdk_screen_get_default ());
 
741
        gtk_window_set_startup_id (GTK_WINDOW (window), startup_id);
 
742
 
 
743
        if (selection != NULL) {
 
744
                sel_list = g_list_prepend (sel_list, nautilus_file_get (selection));
 
745
        }
 
746
 
 
747
        nautilus_window_slot_open_location (nautilus_window_get_active_slot (window),
 
748
                                            location,
 
749
                                            0,
 
750
                                            sel_list);
 
751
 
 
752
        if (sel_list != NULL) {
 
753
                nautilus_file_list_free (sel_list);
 
754
        }
 
755
}
 
756
 
732
757
static void
733
758
nautilus_application_open (GApplication *app,
734
759
                           GFile **files,
767
792
static void
768
793
nautilus_application_init (NautilusApplication *application)
769
794
{
770
 
        GSimpleActionGroup *action_group;
771
795
        GSimpleAction *action;
772
796
 
773
797
        application->priv =
774
798
                G_TYPE_INSTANCE_GET_PRIVATE (application, NAUTILUS_TYPE_APPLICATION,
775
799
                                             NautilusApplicationPriv);
776
800
 
777
 
        action_group = g_simple_action_group_new ();
778
801
        action = g_simple_action_new ("quit", NULL);
779
 
        g_simple_action_group_insert (action_group, G_ACTION (action));
780
802
 
781
 
        g_application_set_action_group (G_APPLICATION (application),
782
 
                                        G_ACTION_GROUP (action_group));
 
803
        g_action_map_add_action (G_ACTION_MAP (application), G_ACTION (action));
783
804
 
784
805
        g_signal_connect_swapped (action, "activate",
785
806
                                  G_CALLBACK (nautilus_application_quit), application);
786
807
 
787
 
        g_object_unref (action_group);
788
808
        g_object_unref (action);
789
809
}
790
810
 
804
824
        g_free (application->priv->geometry);
805
825
 
806
826
        nautilus_dbus_manager_stop ();
 
827
        nautilus_freedesktop_dbus_stop ();
807
828
        notify_uninit ();
808
829
 
809
830
        G_OBJECT_CLASS (nautilus_application_parent_class)->finalize (object);
878
899
{
879
900
        gboolean perform_self_check = FALSE;
880
901
        gboolean version = FALSE;
 
902
        gboolean browser = FALSE;
881
903
        gboolean kill_shell = FALSE;
882
904
        gboolean no_default_window = FALSE;
883
905
        gchar **remaining = NULL;
888
910
                { "check", 'c', 0, G_OPTION_ARG_NONE, &perform_self_check, 
889
911
                  N_("Perform a quick set of self-check tests."), NULL },
890
912
#endif
 
913
                /* dummy, only for compatibility reasons */
 
914
                { "browser", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &browser,
 
915
                  NULL, NULL },
891
916
                { "version", '\0', 0, G_OPTION_ARG_NONE, &version,
892
917
                  N_("Show the version of the program."), NULL },
893
918
                { "geometry", 'g', 0, G_OPTION_ARG_STRING, &self->priv->geometry,
1102
1127
 
1103
1128
        /* create DBus manager */
1104
1129
        nautilus_dbus_manager_start (app);
 
1130
        nautilus_freedesktop_dbus_start (self);
1105
1131
 
1106
1132
        /* initialize preferences and create the global GSettings objects */
1107
1133
        nautilus_global_preferences_init ();