callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* New upstream bugfix release:

Browse Source 
+ debian/patches/040_filechooser_single-click.patch,
    debian/patches/093_directfb-type-changes.patch,
    debian/patches/094_directfb-deprecation-fixes.patch:
    - Dropped, merged upstream.
  + debian/patches/070_mandatory-relibtoolize.patch:
    - Regenerated for the new version.
This commit is contained in:
Sebastian Dröge
2008-02-13 08:32:11 +00:00
parent e3362efa52
commit 9430a55cc3
6 changed files with 3024 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
gtk+2.0 (2.12.8-1) UNRELEASED; urgency=low
* New upstream bugfix release:
+ debian/patches/040_filechooser_single-click.patch,
debian/patches/093_directfb-type-changes.patch,
debian/patches/094_directfb-deprecation-fixes.patch:
- Dropped, merged upstream.
+ debian/patches/070_mandatory-relibtoolize.patch:
- Regenerated for the new version.
-- Sebastian Dröge <slomo@debian.org> Wed, 13 Feb 2008 09:11:50 +0100
gtk+2.0 (2.12.7-1) unstable; urgency=low
* Fix GNOME casing in gtk-faq and gtk doc base descriptions.

147
debian/patches/040_filechooser_single-click.patch vendored
View File

@ -1,147 +0,0 @@
Debian #405296; GNOME #148828; permit single click in filechooser instead of
requiring double-click.
--- gtk+2.0-2.12.4.orig/gtk/gtkfilechooserdefault.c 2008-01-08 05:20:08.000000000 +0100
+++ gtk+2.0-2.12.4/gtk/gtkfilechooserdefault.c 2008-01-08 17:55:56.000000000 +0100
@@ -390,10 +390,6 @@
static void filter_combo_changed (GtkComboBox *combo_box,
GtkFileChooserDefault *impl);
-static void shortcuts_row_activated_cb (GtkTreeView *tree_view,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- GtkFileChooserDefault *impl);
static gboolean shortcuts_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
@@ -1996,9 +1992,7 @@
profile_start ("start", NULL);
- /* As there is no separator now, we want to start there.
- */
- start_row = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
+ start_row = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR) + 1;
num_inserted = 0;
for (; paths; paths = paths->next)
@@ -2010,6 +2004,8 @@
if (impl->local_only &&
!gtk_file_system_path_is_local (impl->file_system, path))
continue;
+ if (shortcut_find_position (impl, path) != -1)
+ continue;
label = gtk_file_system_get_bookmark_label (impl->file_system, path);
@@ -2239,13 +2235,14 @@
impl->num_bookmarks + 1);
impl->num_bookmarks = 0;
+ shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
bookmarks = gtk_file_system_list_bookmarks (impl->file_system);
shortcuts_append_paths (impl, bookmarks);
gtk_file_paths_free (bookmarks);
- if (impl->num_bookmarks > 0)
- shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
+ if (impl->num_bookmarks == 0)
+ shortcuts_remove_rows (impl, shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR), 1);
if (impl->shortcuts_pane_filter_model)
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model));
@@ -3651,8 +3648,22 @@
shortcuts_selection_changed_cb (GtkTreeSelection *selection,
GtkFileChooserDefault *impl)
{
+ GtkTreeIter iter;
+ GtkTreeIter child_iter;
+
bookmarks_check_remove_sensitivity (impl);
shortcuts_check_popup_sensitivity (impl);
+
+ if (impl->changing_folder)
+ return;
+
+ if (gtk_tree_selection_get_selected(selection, NULL, &iter))
+ {
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model),
+ &child_iter,
+ &iter);
+ shortcuts_activate_iter (impl, &child_iter);
+ }
}
static gboolean
@@ -3924,7 +3935,7 @@
GDK_ACTION_COPY | GDK_ACTION_MOVE);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));
- gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
gtk_tree_selection_set_select_function (selection,
shortcuts_select_func,
impl, NULL);
@@ -3932,9 +3943,6 @@
g_signal_connect (selection, "changed",
G_CALLBACK (shortcuts_selection_changed_cb), impl);
- g_signal_connect (impl->browse_shortcuts_tree_view, "row_activated",
- G_CALLBACK (shortcuts_row_activated_cb), impl);
-
g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
G_CALLBACK (shortcuts_key_press_event_cb), impl);
@@ -8598,25 +8606,6 @@
gtk_file_path_free (path);
return retval;
}
- else if (impl->toplevel_last_focus_widget == impl->browse_shortcuts_tree_view)
- {
- /* The focus is on a dialog's action area button, *and* the widget that
- * was focused immediately before it is the shortcuts list. Switch to the
- * selected shortcut and tell the caller not to respond.
- */
- GtkTreeIter iter;
-
- if (shortcuts_get_selected (impl, &iter))
- {
- shortcuts_activate_iter (impl, &iter);
-
- focus_browse_tree_view_if_possible (impl);
- }
- else
- goto file_list;
-
- return FALSE;
- }
else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
{
/* The focus is on a dialog's action area button, *and* the widget that
@@ -10476,25 +10465,6 @@
}
}
-/* Callback used when a row in the shortcuts list is activated */
-static void
-shortcuts_row_activated_cb (GtkTreeView *tree_view,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- GtkFileChooserDefault *impl)
-{
- GtkTreeIter iter;
- GtkTreeIter child_iter;
-
- if (!gtk_tree_model_get_iter (impl->shortcuts_pane_filter_model, &iter, path))
- return;
-
- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model),
- &child_iter,
- &iter);
- shortcuts_activate_iter (impl, &child_iter);
-}
-
/* Handler for GtkWidget::key-press-event on the shortcuts list */
static gboolean
shortcuts_key_press_event_cb (GtkWidget *widget,

3286
debian/patches/070_mandatory-relibtoolize.patch vendored
View File

File diff suppressed because it is too large Load Diff

22
debian/patches/093_directfb-type-changes.patch vendored
View File

@ -1,22 +0,0 @@
--- gtk+2.0-2.12.4.orig/gdk/directfb/gdkcursor-directfb.c 2008-01-08 05:20:48.000000000 +0100
+++ gtk+2.0-2.12.4/gdk/directfb/gdkcursor-directfb.c 2008-01-08 17:58:13.000000000 +0100
@@ -46,6 +46,19 @@
#define u8 __u8
#endif
+
+/* Workaround for DirectFB >= 1.0.0-rc2 not
+ * defining __u32 anymore when DIRECTFB_NO_CRUFT
+ * is set, which is the default on Debian systems.
+ */
+#ifndef __u32
+#define __u32 u32
+#endif
+
+#ifndef __u8
+#define __u8 u8
+#endif
+
static struct {
const guchar *bits;
int width, height, hotx, hoty;

118
debian/patches/094_directfb-deprecation-fixes.patch vendored
View File

@ -1,118 +0,0 @@
--- gtk+2.0-2.12.6.orig/gdk/directfb/gdkdrawable-directfb.c 2008-01-29 17:34:23.000000000 +0100
+++ gtk+2.0-2.12.6/gdk/directfb/gdkdrawable-directfb.c 2008-01-29 17:34:42.000000000 +0100
@@ -477,7 +477,7 @@
gint angle1,
gint angle2)
{
- WARN_UNIMPLEMENTED (G_GNUC_FUNCTION);
+ WARN_UNIMPLEMENTED (G_STRLOC);
}
static void
@@ -561,7 +561,7 @@
const gchar *text,
gint text_length)
{
- WARN_UNIMPLEMENTED (G_GNUC_FUNCTION);
+ WARN_UNIMPLEMENTED (G_STRLOC);
}
static void
@@ -573,7 +573,7 @@
const GdkWChar *text,
gint text_length)
{
- WARN_UNIMPLEMENTED (G_GNUC_FUNCTION);
+ WARN_UNIMPLEMENTED (G_STRLOC);
}
static void
--- gtk+2.0-2.12.6.orig/gdk/directfb/gdkimage-directfb.c 2008-01-29 17:34:59.000000000 +0100
+++ gtk+2.0-2.12.6/gdk/directfb/gdkimage-directfb.c 2008-01-29 17:35:10.000000000 +0100
@@ -151,7 +151,7 @@
GDK_NOTE (MISC, g_print ("gdk_image_new_bitmap: %dx%d\n", w, h));
- g_message ("not fully implemented %s", G_GNUC_FUNCTION);
+ g_message ("not fully implemented %s", G_STRLOC);
image->bpl = (w + 7) / 8;
image->mem = g_malloc (image->bpl * h);
@@ -209,7 +209,7 @@
format = DSPF_ARGB;
break;
default:
- g_message ("unimplemented %s for depth %d", G_GNUC_FUNCTION, depth);
+ g_message ("unimplemented %s for depth %d", G_STRLOC, depth);
return NULL;
}
--- gtk+2.0-2.12.6.orig/gdk/directfb/gdkinput-directfb.c 2008-01-29 17:35:30.000000000 +0100
+++ gtk+2.0-2.12.6/gdk/directfb/gdkinput-directfb.c 2008-01-29 17:35:38.000000000 +0100
@@ -228,7 +228,7 @@
gdk_device_set_mode (GdkDevice *device,
GdkInputMode mode)
{
- g_message ("unimplemented %s", G_GNUC_FUNCTION);
+ g_message ("unimplemented %s", G_STRLOC);
return FALSE;
}
@@ -303,7 +303,7 @@
gint mask,
GdkExtensionMode mode)
{
- g_message ("unimplemented %s", G_GNUC_FUNCTION);
+ g_message ("unimplemented %s", G_STRLOC);
}
GList *
--- gtk+2.0-2.12.6.orig/gdk/directfb/gdkpixmap-directfb.c 2008-01-29 17:35:52.000000000 +0100
+++ gtk+2.0-2.12.6/gdk/directfb/gdkpixmap-directfb.c 2008-01-29 17:36:10.000000000 +0100
@@ -172,7 +172,7 @@
format = DSPF_RGB32;
break;
default:
- g_message ("unimplemented %s for depth %d", G_GNUC_FUNCTION, depth);
+ g_message ("unimplemented %s for depth %d", G_STRLOC, depth);
return NULL;
}
}
--- gtk+2.0-2.12.6.orig/gdk/directfb/gdkwindow-directfb.c 2008-01-29 17:36:26.000000000 +0100
+++ gtk+2.0-2.12.6/gdk/directfb/gdkwindow-directfb.c 2008-01-29 17:36:36.000000000 +0100
@@ -2411,7 +2411,7 @@
return;
/* N/A */
- g_message("unimplemented %s", G_GNUC_FUNCTION);
+ g_message("unimplemented %s", G_STRLOC);
}
void
@@ -2444,7 +2444,7 @@
return FALSE;
/* N/A */
- g_message("unimplemented %s", G_GNUC_FUNCTION);
+ g_message("unimplemented %s", G_STRLOC);
return FALSE;
}
@@ -2462,7 +2462,7 @@
if (GDK_WINDOW_DESTROYED (window))
return;
- g_message("unimplemented %s", G_GNUC_FUNCTION);
+ g_message("unimplemented %s", G_STRLOC);
}
void
@@ -2477,7 +2477,7 @@
if (GDK_WINDOW_DESTROYED (window))
return;
- g_message("unimplemented %s", G_GNUC_FUNCTION);
+ g_message("unimplemented %s", G_STRLOC);
}
/**

3
debian/patches/series vendored
View File

@ -14,13 +14,10 @@
030_gtkentry_password-char-circle.patch
031_gtksearchenginetracker_fixes.patch
033_treeview_resizing.patch
040_filechooser_single-click.patch
041_ia32-libs.patch
042_treeview_single-focus.patch
060_ignore-random-icons.patch
070_mandatory-relibtoolize.patch
091_workaround_no_gtk_init_incorrect_display.patch
092_recentfiles-recursion-fix.patch
093_directfb-type-changes.patch
094_directfb-deprecation-fixes.patch
095_gtk-im-module-setting.patch